Commit graph

192 commits

Author SHA1 Message Date
kervala
9febb7374a merge with develop 2016-01-28 13:27:35 +01:00
kervala
164eb4de7b Merge with develop 2016-01-27 15:16:44 +01:00
kervala
fabef15e80 Merge with develop 2016-01-27 13:30:49 +01:00
kervala
0f3a4cb78e Merge with develop 2016-01-26 23:30:48 +01:00
kervala
ee30d06fa3 Merge 2016-01-26 22:45:40 +01:00
kervala
1dd308474c Merge with develop 2016-01-26 22:44:40 +01:00
kervala
198759a880 Fixed: Use same XML files as on Atys 2016-01-24 17:08:32 +01:00
kervala
059f3b77b4 Merge with develop 2016-01-23 20:33:28 +01:00
kervala
b9a761925b Merge with develop 2016-01-23 19:07:13 +01:00
kervala
9e3ef029c6 Merge with develop 2016-01-23 12:30:33 +01:00
kervala
b8225c4fef Merge with develop 2016-01-21 15:07:14 +01:00
kervala
b1849e9859 Removed: installscript_osx.vdf because we manage it directly in code now 2016-01-21 10:15:09 +01:00
kervala
11f2f1e3e1 Merge with develop 2016-01-21 10:08:56 +01:00
kervala
d82f7de732 Changed: Updated translations 2016-01-20 19:50:51 +01:00
kervala
2d15a8d6e8 Merge with develop 2016-01-20 13:06:47 +01:00
kervala
5ece2ac54f Changed: Updated translations 2016-01-19 09:17:09 +01:00
kervala
63984e4a2a Merge with develop 2016-01-18 21:32:01 +01:00
kervala
3be3e94aec Changed: Remove InstallStatsUrl in client_default.cfg 2016-01-17 20:16:18 +01:00
kervala
6995adfbc7 Merge with develop 2016-01-16 23:50:23 +01:00
kervala
628c2b1d80 Merge with develop 2016-01-16 10:52:18 +01:00
kervala
f4d0b123ee Fixed: Use language name in native language in config window 2016-01-14 22:42:34 +01:00
kervala
130847cac5 Merge with develop 2016-01-14 21:28:47 +01:00
kervala
9c8018d1f7 Merge with develop 2016-01-14 10:22:22 +01:00
kervala
6a5fc56ce0 Merge with develop 2016-01-13 20:05:06 +01:00
kervala
8d905df095 Merge with develop 2016-01-12 22:32:22 +01:00
kervala
ad11c4c4ce Merge with develop 2016-01-11 13:53:32 +01:00
kervala
44bd19fbf4 Merge with develop 2016-01-11 12:55:47 +01:00
kervala
6c341fc348 Merge with develop 2016-01-11 10:09:58 +01:00
kervala
aed875fe3b Merge with develop 2016-01-09 19:42:29 +01:00
kervala
6e471c02d3 Merge with develop 2016-01-09 19:32:59 +01:00
kervala
79d11b8919 Merge with develop 2016-01-09 18:10:49 +01:00
kervala
fd21a8f50a Merge with develop 2016-01-09 17:17:59 +01:00
kervala
e0e990566c Merge with develop 2016-01-09 16:32:59 +01:00
kervala
48757c15b7 Merge with develop 2016-01-09 16:08:34 +01:00
kervala
989569c137 Merge with develop 2016-01-07 17:41:02 +01:00
kervala
bb9da04b4f Changed: Entra?neur instead of Moniteur 2016-01-07 15:33:46 +01:00
kervala
df6397132f Merge with develop 2016-01-06 23:22:57 +01:00
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
kervala
d46d1e45ad Merge with develop 2016-01-05 13:00:18 +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
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
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