Commit Graph

77 Commits

Author SHA1 Message Date
commy2
f4f69deb83 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into 11thmeu-master 2015-04-13 20:22:36 +02:00
commy2
804079cfae manual merge 2015-04-13 20:20:55 +02:00
Pierre (meat)
c9e048e6b3 Update AUTHORS.txt 2015-04-13 20:03:19 +02:00
KoffeinFlummi
8d4003a396 Merge https://github.com/HerrStein/ACE3 into german-merge 2015-04-13 14:21:00 +02:00
KoffeinFlummi
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
jaynus
c9e2eb0869 Changed: no-crosshair reticle for Titan by BlackPixxel 2015-04-12 14:05:12 -07:00
KoffeinFlummi
390a777286 Merge branch 'patch-1' of https://github.com/Kllrt/ACE3
Conflicts:
	AUTHORS.txt
2015-04-12 15:55:17 +02:00
ruPaladin
215f3059f3 Update AUTHORS.txt
Russian translation
2015-04-12 15:33:24 +03:00
Asgar
32400a21ac update AUTHORS.txt 2015-04-12 10:49:22 +02:00
Felix Wiegand
0efcd7d56f Merge pull request #499 from gienkov/patch-2
AUTHORS.TXT / e-mail of me and ACCtomeek
2015-04-12 04:23:59 +02:00
Felix Wiegand
4d1e21d362 Merge pull request #500 from licht-im-Norden87/patch-4
Update AUTHORS.txt
2015-04-12 03:41:18 +02:00
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
licht-im-Norden87
200c380622 Update AUTHORS.txt 2015-04-12 03:16:42 +02:00
Grzegorz
2182e8b631 e-mail of me and ACCtomeek 2015-04-12 03:15:57 +02:00
Kllrt
37a80139b8 Update AUTHORS.txt 2015-04-12 00:56:58 +02:00
FreeZbe
2ccec59b80 Update AUTHORS.txt 2015-04-12 00:14:33 +02:00
EpMAK
8406031a6e Update AUTHORS.txt 2015-04-12 00:03:45 +03:00
jaynus
75216c2f8b readme, authors. 2015-04-11 13:39:16 -07:00
commy2
2a72e183b1 Merge pull request #450 from Tenga/master
Count the commander camera as a 3rd person camera
2015-04-10 21:54:52 +02:00
Tenga
eec5f458db Count the commander camera as a 3rd person camera 2015-04-10 20:05:33 +02:00
Kavinsky
7c2b1a4ecc Added Kavinsky to AUTHORS.txt 2015-04-10 17:03:07 +02:00
Legolasindar
fa9923c027 Update AUTHORS.txt
added my email
2015-04-10 16:15:53 +02:00
Anthariel
396f6bd0ea Update AUTHORS.txt 2015-04-10 06:34:36 +02:00
KoffeinFlummi
bfca14493a Update AUTHORS file 2015-04-04 01:04:03 +02:00
bux578
869e36eb5f added email address 2015-02-02 19:22:07 +01:00
PabstMirror
5958aab66f Update AUTHORS.txt 2015-02-01 14:21:30 -06:00
KoffeinFlummi
979222d21c Add AGM authors list 2015-01-11 22:36:31 +01:00