Commit graph

5312 commits

Author SHA1 Message Date
kervala
63a6f0f837 Merge with develop 2016-01-06 16:06:23 +01:00
kervala
88226323e0 Merge with develop 2016-01-06 13:22:47 +01:00
Nimetu
378b520048 Merge with develop 2016-01-06 01:02:22 +02:00
kervala
4520020f3b Merge with develop 2016-01-05 17:12:29 +01:00
kervala
d46d1e45ad Merge with develop 2016-01-05 13:00:18 +01:00
kervala
e5a1249cb8 Merge with develop 2016-01-04 22:17:00 +01:00
kervala
b02956196d Merge with develop 2016-01-04 19:27:21 +01:00
kervala
477759217b Merge with develop 2016-01-04 16:15:03 +01:00
kervala
7de5594966 Merge with develop 2016-01-04 15:41:29 +01:00
kervala
a6694d122b Merge with develop 2016-01-04 14:03:11 +01:00
kervala
16d66c0dcc Merge with develop 2016-01-03 20:13:53 +01:00
kervala
d3d58ebe82 Merge with develop 2016-01-03 19:36:10 +01:00
kervala
f632b66274 Merge with develop 2016-01-03 19:18:32 +01:00
kervala
a046a06db3 Merge with develop 2016-01-03 18:16:07 +01:00
kervala
50b846d56c Merge with develop 2016-01-02 22:36:05 +01:00
kervala
7879ca7566 Merge with develop 2016-01-02 20:29:55 +01:00
kervala
1354d99609 Merge with develop 2016-01-02 17:11:59 +01:00
kervala
2d2c79a2b3 Merge with develop 2016-01-02 11:35:26 +01:00
kervala
83f8502b51 Merge with develop 2016-01-01 16:27:45 +01:00
kervala
7a44693ec2 Fixed: Replaced Mage and Magene (???) by Magicien and Magicienne 2015-12-30 10:12:27 +01:00
kervala
3b71e02577 Merge with develop 2015-12-30 00:46:50 +01:00
kervala
6611f6ef07 Merge with develop 2015-12-30 00:14:27 +01:00
kervala
e8c6fd67db Merge with develop 2015-12-30 00:10:51 +01:00
kervala
4f24898102 Merge with develop 2015-12-29 22:36:04 +01:00
kervala
1454a3bc67 Merge with develop 2015-12-29 18:03:21 +01:00
Nimetu
9fc64124f3 Merge with develop 2015-12-29 15:03:12 +02:00
kervala
965971a86d Merge with develop 2015-12-28 18:21:56 +01:00
kervala
de1519f50b Merge with develop 2015-12-28 16:44:35 +01:00
kervala
79df345ecc Changed: Updated translations 2015-12-28 10:32:15 +01:00
kervala
32ba03e3cc Merge with develop 2015-12-27 16:07:11 +01:00
kervala
cde1975f25 Merge with develop 2015-12-26 18:00:04 +01:00
kervala
ce91dc1cf8 Merge with develop 2015-12-26 15:13:08 +01:00
kervala
f66c15c5da Merge with develop 2015-12-26 14:38:37 +01:00
kervala
8dda998ea5 Merged with develop 2015-12-25 20:52:18 +01:00
kervala
e1ee398c0f Merge with develop 2015-12-25 18:02:13 +01:00
kervala
0a03d1c870 Merge with develop 2015-12-25 15:37:07 +01:00
kervala
2e43768bd0 Changed: Updated translations 2015-12-23 23:11:59 +01:00
kervala
d2676c3b57 Merge with develop 2015-12-23 15:31:37 +01:00
Nimetu
0f44e01d18 Merge with develop 2015-12-22 01:30:11 +02:00
kervala
5ffb6e3b89 Merge with develop 2015-12-21 18:20:39 +01:00
kervala
560a51136f Changed: Only copy installscript_osx.vdf for Steam client 2015-12-21 17:46:38 +01:00
kervala
c09d7e6884 Merge with develop 2015-12-21 17:39:49 +01:00
kervala
4308bda508 Merge with develop 2015-12-21 14:21:08 +01:00
kervala
c1ebe700aa Changed: Updated translations 2015-12-21 14:19:49 +01:00
kervala
2368805d2f Merge with develop 2015-12-20 19:26:36 +01:00
kervala
6c19bba957 Changed: Revert back PreDataPath directories 2015-12-20 18:56:23 +01:00
kervala
a7f0b854d2 Merge with develop 2015-12-20 11:21:40 +01:00
kervala
b789361919 Changed: Updated translations 2015-12-20 09:50:48 +01:00
Nimetu
03242fbc41 Merge with develop 2015-12-20 03:34:00 +02:00
Nimetu
2c94ec2e2d Merge with develop 2015-12-19 20:40:05 +02:00