Commit graph

46 commits

Author SHA1 Message Date
kervala
93a0e60b59 Merge with develop 2016-02-06 00:24:44 +01:00
kervala
59dcd867e9 Merge with develop 2016-02-03 21:58:58 +01:00
kervala
5d3385510b Merge with develop 2016-02-02 20:49:21 +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
4d29b54d0a Merge with develop 2016-02-02 14:33:32 +01:00
kervala
4808dfcecb Merge with develop 2016-02-02 12:37:59 +01:00
kervala
164eb4de7b Merge with develop 2016-01-27 15:16:44 +01:00
kervala
1dd308474c Merge with develop 2016-01-26 22:44:40 +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
b1849e9859 Removed: installscript_osx.vdf because we manage it directly in code now 2016-01-21 10:15:09 +01:00
kervala
2d15a8d6e8 Merge with develop 2016-01-20 13:06:47 +01:00
kervala
63984e4a2a Merge with develop 2016-01-18 21:32:01 +01:00
kervala
628c2b1d80 Merge with develop 2016-01-16 10:52:18 +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
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
88226323e0 Merge with develop 2016-01-06 13:22:47 +01:00
kervala
a6694d122b Merge with develop 2016-01-04 14:03:11 +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
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
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
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
d2676c3b57 Merge with develop 2015-12-23 15:31:37 +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
2368805d2f Merge with develop 2015-12-20 19:26:36 +01:00
kervala
a7f0b854d2 Merge with develop 2015-12-20 11:21:40 +01:00
Nimetu
2c94ec2e2d Merge with develop 2015-12-19 20:40:05 +02:00
kervala
5752e8a04b Changed: Updated translations 2015-12-18 13:02:31 +01:00