KoffeinFlummi 614afa8537 Merge https://github.com/Kllrt/ACE3 into czech-merge
Conflicts:
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/goggles/stringtable.xml
	addons/grenades/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
..
2015-03-26 23:14:22 +01:00
2015-01-12 19:22:58 +01:00
2015-03-25 06:32:08 +01:00
2015-01-12 19:22:58 +01:00
2015-03-24 20:28:44 +01:00
2015-03-24 16:01:53 +01:00
2015-01-12 22:34:01 +01:00
2015-03-24 20:28:44 +01:00
2015-01-12 22:34:01 +01:00
2015-03-24 20:28:44 +01:00
2015-04-03 01:27:22 +02:00
2015-02-14 20:06:55 +01:00
2015-01-26 13:35:31 +01:00
2015-04-08 21:51:42 +02:00
2015-01-12 19:22:58 +01:00

ace_common

Common functions and systems used by other components.

Maintainers

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