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
..
2015-04-08 13:55:29 -05:00
2015-01-18 08:20:55 +01:00
2015-03-27 20:51:30 -05:00
2015-01-18 08:20:55 +01:00
2015-03-27 19:22:49 -05:00
2015-01-18 08:20:55 +01:00
2015-03-27 23:26:41 -05:00

ace_markers

Completely replaces the default marker system, allowing quicker and more precise placement of markers.

Maintainers

The people responsible for merging changes to this component or answering potential questions.