SilentSpike 159937dc45 Merge branch 'master' into ace_spectator
Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd
2015-07-26 14:15:24 +01:00
..
2015-06-09 18:33:39 +02:00
2015-06-07 22:00:43 +02:00
2015-06-08 23:25:15 +02:00
2015-06-07 22:38:23 +02:00
2015-06-07 22:00:43 +02:00

ace_sitting

The Sitting module introduces ability to sit on different chairs and toilets.

Maintainers

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