KoffeinFlummi
11f9478035
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
2015-04-16 18:31:31 +02:00
..
2015-04-05 15:16:32 -07:00
2015-04-16 00:17:17 +02:00
2015-04-15 22:16:54 +02:00
2015-04-07 19:16:56 +02:00
2015-02-26 07:41:56 +01:00
2015-04-14 22:50:06 +02:00
2015-04-08 07:35:31 +02:00
2015-04-12 18:01:29 +02:00
2015-04-14 22:07:43 +02:00
2015-04-14 21:28:18 +02:00
2015-03-06 22:54:44 +01:00
2015-03-01 14:06:44 +01:00
2015-04-14 22:34:19 +02:00
2015-04-14 22:57:18 +02:00
2015-04-09 13:23:29 +02:00
2015-03-01 10:36:52 +01:00
2015-04-01 20:03:44 +02:00
2015-04-16 18:31:31 +02:00
2015-04-06 09:22:43 -07:00
2015-04-14 19:17:05 -03:00
2015-04-14 23:23:15 -05:00
2015-03-26 15:52:30 -05:00