bux578
|
0e3d971274
|
Fix translations error
|
2015-04-12 07:46:43 +02:00 |
|
KoffeinFlummi
|
59952441d8
|
Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge
|
2015-04-12 06:22:17 +02:00 |
|
esteldunedain
|
d6e70cfe6b
|
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 16:20:18 -03:00 |
|
Legolasindar
|
dc44b73a36
|
Update stringtable.xml
updated spanish terms
|
2015-04-10 01:12:31 +02:00 |
|
licht-im-Norden87
|
0986eb427d
|
Update stringtable.xml
|
2015-04-09 23:41:10 +02:00 |
|
bux578
|
92da20ce62
|
translations
#367
|
2015-04-07 10:02:33 +02:00 |
|
jaynus
|
1e29509b45
|
Dragon, lasers, air_hud and javelin code.
|
2015-01-11 10:24:19 -08:00 |
|