Commit graph

205 commits

Author SHA1 Message Date
kervala
76c27c64f8 Merge with develop 2016-10-21 14:27:31 +02:00
kervala
c3bcfb42b8 Merge with develop 2016-10-20 13:08:48 +02:00
kervala
80cbda23e5 Merge with develop 2016-10-18 10:27:44 +02:00
kervala
8a52b34e09 Merge with develop 2016-10-17 11:49:38 +02:00
kervala
6fc8853d51 Merge with develop 2016-10-15 17:16:34 +02:00
kervala
35b59843cf Merge with develop 2016-10-10 18:55:28 +02:00
kervala
8fd439eb34 Merge with develop 2016-10-01 18:43:48 +02:00
kervala
6744ded402 Merge with develop 2016-09-28 23:55:21 +02:00
kervala
c1439da922 Merge with develop 2016-09-25 10:50:38 +02:00
kervala
e1555f9e24 Merge with develop 2016-09-24 15:54:47 +02:00
kervala
4c51c4e68c Merge with develop 2016-09-24 14:22:22 +02:00
kervala
db718f9a40 Merge with develop 2016-09-23 13:32:12 +02:00
Nimetu
e146348e03 Merge with develop 2016-09-21 20:12:51 +03:00
kervala
2455fc02d7 Merge with develop 2016-09-19 14:52:47 +02:00
kervala
e68258e56e Merge with develop 2016-09-16 19:25:17 +02:00
kervala
89ab635693 Merge with develop 2016-09-12 14:39:38 +02:00
kervala
8c0af53b48 Merge with develop 2016-09-03 10:15:39 +02:00
Nimetu
3610c6c8cb Merge with develop 2016-08-30 21:27:56 +03:00
kervala
8af64c9e71 Merge with develop 2016-08-06 20:12:39 +02:00
Nimetu
70aa8676c2 Merge with develop 2016-07-25 19:27:04 +03:00
Nimetu
85838aec19 Merge with develop 2016-07-24 16:09:25 +03:00
Nimetu
0be0a1e9e7 Merge with develop 2016-07-23 11:28:22 +03:00
kervala
120d2d7dba Merge with develop 2016-06-26 19:43:53 +02:00
Nimetu
975ed523be Merge with develop 2016-06-25 22:30:51 +03:00
kervala
ad98793560 Merge with develop 2016-06-19 21:10:23 +02:00
kervala
f54109d279 Merge with develop 2016-06-18 22:41:12 +02:00
kervala
41ef412c0c Merge with develop 2016-06-16 17:16:27 +02:00
kervala
e22cc2acf2 Merge with develop 2016-06-14 20:18:10 +02:00
kervala
3ae8a19af1 Merge with develop 2016-06-12 15:44:48 +02:00
Nimetu
8f9d7078bd Merge with develop 2016-06-12 12:49:14 +03:00
kervala
a096a9ccff Merge with develop 2016-06-07 20:01:47 +02:00
kervala
d5b086b0c8 Merge with develop 2016-06-04 17:05:41 +02:00
Nimetu
dca7c1f40b Merge with develop 2016-06-04 10:36:21 +03:00
kervala
d6fc8af573 Merge with develop 2016-05-30 17:51:54 +02:00
kervala
ac448eac18 Merge with develop 2016-05-27 22:24:20 +02:00
kervala
6fbf8c5326 Merge with develop 2016-05-26 19:36:25 +02:00
Nimetu
13bef3b94d Merge with develop 2016-05-14 13:47:03 +03:00
kervala
673fb8d52a Merge with develop 2016-05-13 20:55:24 +02:00
Nimetu
8c7086fa9d Merge with develop 2016-05-13 13:58:33 +03:00
Nimetu
932acf2e11 Merge with develop 2016-05-09 20:14:15 +03:00
kervala
7bcf3bfe5c Merge with develop 2016-05-08 19:24:04 +02:00
kervala
bf79b16b5b Merge with develop 2016-05-08 13:42:53 +02:00
Nimetu
3530beb7fe Merge with develop 2016-05-05 15:01:10 +03:00
Nimetu
a26d4063f7 Merge with develop 2016-04-23 18:49:52 +03:00
kervala
77927a2558 Merge with develop 2016-04-15 16:12:32 +02:00
kervala
9c3dc650e7 Backed out changeset: 44cd3beacab6 2016-04-14 18:56:48 +02:00
kervala
45565e2bb8 Changed: Temporary checks for a OS X 10.7 bug... 2016-04-14 18:19:19 +02:00
kervala
910c6dc7b9 Merge with develop 2016-04-12 15:43:47 +02:00
kervala
208e02b31e Merge with develop 2016-04-06 09:34:34 +02:00
kervala
587804cab7 Merge with develop 2016-04-02 13:32:28 +02:00
kervala
e29d08861d Merge with develop 2016-04-02 11:34:39 +02:00
kervala
2d5cf29861 Merge with develop 2016-03-20 17:28:00 +01:00
kaetemi
4bdca3e82e Merge with develop 2016-03-19 22:34:32 +01:00
kervala
5109ae5443 Merge with develop 2016-03-19 19:30:06 +01:00
kervala
dc52b3e24f Merge with develop 2016-03-19 16:21:46 +01:00
kervala
371cba9a84 Merge with develop 2016-03-18 22:27:43 +01:00
kervala
63b2843232 Merge with develop 2016-03-18 22:16:28 +01:00
kervala
f192068bc4 Merge with develop 2016-03-16 19:15:11 +01:00
kervala
0e1cbe909c Merge with develop 2016-03-15 12:37:11 +01:00
kaetemi
4eb9d884d0 Merge with develop 2016-03-10 12:09:18 +01:00
kaetemi
eb8835c36c Merge with develop 2016-03-08 12:46:47 +01:00
kervala
417b72447c Changed: Temporarily disable Spanish and Russian translations (not yet ready) 2016-03-05 12:45:49 +01:00
Nimetu
526a716948 Merge with develop 2016-03-03 00:00:30 +02:00
Nimetu
94d2d95efa Merge with develop 2016-03-01 22:39:10 +02:00
kervala
ea7463afc0 Merge with develop 2016-02-28 16:46:11 +01:00
kervala
379af19bd9 Merge with develop 2016-02-28 12:46:34 +01:00
kervala
207f749a93 Merge with develop 2016-02-27 19:22:53 +01:00
kervala
24cfde8037 Merge with develop 2016-02-27 18:39:41 +01:00
kervala
75199aad21 Merge with develop 2016-02-23 17:05:57 +01:00
kervala
9b53b815f7 Merge with develop 2016-02-21 20:30:16 +01:00
kervala
c4b768833b Merge with develop 2016-02-21 13:22:22 +01:00
kervala
0350c97f0a Merge with develop 2016-02-20 19:29:00 +01:00
kervala
708c5d0d41 Merge with develop 2016-02-15 12:11:08 +01:00
kervala
ed8afa1b6c Merge with develop 2016-02-14 19:59:16 +01:00
kervala
17e86cce21 Merge with develop 2016-02-14 19:16:53 +01:00
kervala
08e9906e0d Merge with develop 2016-02-14 18:21:41 +01:00
Nimetu
02d706092b Merge with develop 2016-02-14 01:24:10 +02:00
kervala
3ab60af016 Merge with develop 2016-02-13 23:43:04 +01:00
kervala
5bf0b023e3 Merge with develop 2016-02-13 14:00:02 +01:00
kervala
7212a8e360 Merge with develop 2016-02-12 16:05:43 +01:00
kervala
3a5c2da73d Merge with develop 2016-02-11 21:01:27 +01:00
kervala
06bfd577a4 Merge with develop 2016-02-10 18:48:09 +01:00
kervala
4bfacefdd8 Merge with develop 2016-02-05 12:30:26 +01:00
kervala
cb4c93648e Merge with develop 2016-02-04 14:33:30 +01:00
kervala
59dcd867e9 Merge with develop 2016-02-03 21:58:58 +01:00
kervala
0880232caa Merge with develop 2016-02-02 19:51:11 +01:00
kervala
c85cbfc869 Merge with develop 2016-02-02 19:31:12 +01:00
kervala
4808dfcecb Merge with develop 2016-02-02 12:37:59 +01:00
kervala
058b36aa4a Merge with develop 2016-02-01 09:07:45 +01:00
kervala
9febb7374a merge with develop 2016-01-28 13:27:35 +01:00
kervala
fabef15e80 Merge with develop 2016-01-27 13:30:49 +01:00
kervala
8083f47f35 Merge with develop 2016-01-26 23:43:34 +01:00
kervala
0f3a4cb78e Merge with develop 2016-01-26 23:30:48 +01:00
kervala
1dd308474c Merge with develop 2016-01-26 22:44:40 +01:00
kervala
b9a761925b Merge with develop 2016-01-23 19:07:13 +01:00
kervala
56f56def72 Merge with develop 2016-01-23 13:03:27 +01:00
kervala
9e3ef029c6 Merge with develop 2016-01-23 12:30:33 +01:00
kervala
40719ddda8 Merge with develop 2016-01-23 10:59:56 +01:00
kervala
f8ceec9e3d Merge with develop 2016-01-23 10:28:00 +01:00
kervala
39e8135a82 Merge with develop 2016-01-23 10:19:01 +01:00