mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00

History

KoffeinFlummi 1b67b2df26 Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

Conflicts:
	addons/disposable/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml

2015-04-15 22:20:47 +02:00

data

Reordered the map, mapfx and pbos:

2015-03-14 16:58:05 -03:00

functions

Cleanup / Headers

2015-04-07 15:01:44 -05:00

#86 - Stretch gps info box to support 8 digits

2015-04-07 15:47:12 -05:00

$PBOPREFIX$

+2more

2015-03-21 12:18:19 -05:00