Commit Graph

13152 Commits

Author SHA1 Message Date
jl777
951bb1bbfb Test 2017-03-18 08:41:09 +02:00
jl777
f841307885 Test 2017-03-18 08:35:35 +02:00
jl777
6401fd9fd1 Test 2017-03-18 08:30:44 +02:00
jl777
4dabad2cf6 Test 2017-03-17 18:50:49 +02:00
jl777
d1ceb5c250 Test 2017-03-17 18:27:02 +02:00
jl777
6ef472f7ee Merge branch 'beta' into dev 2017-03-17 18:19:16 +02:00
jl777
8c0fcef59b Merge pull request #298 from jl777/dev
Touch
2017-03-17 18:16:08 +02:00
jl777
72475d0bf6 Test 2017-03-17 18:15:37 +02:00
jl777
8f3aa743bd Touch 2017-03-17 18:14:40 +02:00
jl777
98b0f4cd90 Merge pull request #297 from jl777/dev
Remove print
2017-03-17 18:03:59 +02:00
jl777
68025c1c83 Remove print 2017-03-17 18:03:33 +02:00
jl777
25a3e25da8 Merge pull request #296 from jl777/dev
Dev
2017-03-17 17:25:16 +02:00
jl777
f79f75befe Test 2017-03-17 17:18:45 +02:00
jl777
ea73ef003b Test 2017-03-17 17:16:45 +02:00
jl777
82fd1939be Test 2017-03-17 17:09:33 +02:00
jl777
7bf32ee2da Test 2017-03-17 17:05:15 +02:00
jl777
8577cb2870 Test 2017-03-17 16:53:06 +02:00
jl777
1ecb854188 Test 2017-03-17 16:49:18 +02:00
jl777
5e9f4470d1 Test 2017-03-17 16:43:16 +02:00
jl777
d6cc943d62 Test 2017-03-17 16:42:47 +02:00
jl777
83c54f308f Test 2017-03-17 16:40:37 +02:00
jl777
fbe307fd32 Test 2017-03-17 16:38:03 +02:00
jl777
b24e2baaaa Touch 2017-03-17 16:31:21 +02:00
jl777
74d67d42d1 Prevent 'A' and 'X' events 2017-03-17 16:25:20 +02:00
jl777
16c7bf6bd7 Merge back most changes 2017-03-17 16:02:28 +02:00
jl777
16cd9f2db3 Revert to main 2017-03-17 15:42:27 +02:00
jl777
c2070e57ff Revert "Merge branch 'master' into dev"
This reverts commit c0addba809, reversing
changes made to d19a9837c2.
2017-03-17 15:09:19 +02:00
jl777
c0addba809 Merge branch 'master' into dev 2017-03-17 15:08:26 +02:00
jl777
d19a9837c2 Test 2017-03-17 14:27:01 +02:00
jl777
8aed57832b Test 2017-03-17 14:23:43 +02:00
jl777
d82233d940 Test 2017-03-17 14:13:25 +02:00
jl777
6a235586d9 Test 2017-03-17 14:11:36 +02:00
jl777
93722bf741 Test 2017-03-17 14:02:32 +02:00
jl777
7f44a3a97a Test 2017-03-17 13:58:04 +02:00
jl777
628e0bfe14 Merge pull request #293 from jl777/dev
Test
2017-03-17 13:47:49 +02:00
jl777
72460f0d6b Test 2017-03-17 13:37:30 +02:00
jl777
0ce8ef227b Merge pull request #292 from jl777/dev
Test
2017-03-17 08:25:14 +02:00
jl777
ad4559b140 Test 2017-03-17 08:24:48 +02:00
jl777
317558d445 Merge pull request #291 from jl777/dev
disable redeems
2017-03-17 08:15:33 +02:00
jl777
05ca2ffc17 disable redeems 2017-03-17 08:15:03 +02:00
jl777
196ed32f8d Merge pull request #290 from jl777/dev
Dev
2017-03-17 07:57:17 +02:00
jl777
6fd0ae11b7 Test 2017-03-17 07:56:32 +02:00
jl777
8c782a55cb Test 2017-03-17 07:51:04 +02:00
jl777
47609f61aa Test 2017-03-17 07:43:44 +02:00
jl777
f3159f7712 Test 2017-03-17 07:24:40 +02:00
jl777
dd67ab017e Test 2017-03-17 07:23:10 +02:00
jl777
2c70b583c5 Test 2017-03-17 07:19:58 +02:00
jl777
a17692de3c Test 2017-03-17 07:13:51 +02:00
jl777
a13467f55f Test 2017-03-17 07:01:14 +02:00
jl777
572f12e988 Test 2017-03-17 06:55:35 +02:00