Commit graph

8 commits

Author SHA1 Message Date
Nimetu
94d2d95efa Merge with develop 2016-03-01 22:39:10 +02:00
kervala
21da88a762 Merge with develop 2016-02-20 20:44:23 +01:00
kervala
16cacef922 Merge with develop 2016-02-20 19:57:43 +01:00
kervala
3ab60af016 Merge with develop 2016-02-13 23:43:04 +01:00
Nimetu
30454c9ef5 Merge with develop 2016-02-13 17:36:57 +02:00
kervala
f7046f21b1 Merge with develop 2016-02-08 14:37:34 +01:00
kervala
59dcd867e9 Merge with develop 2016-02-03 21:58:58 +01:00
kervala
198759a880 Fixed: Use same XML files as on Atys 2016-01-24 17:08:32 +01:00