esteldunedain 6f4bb48489 Merge branch 'master' into linearMenuExperiment ... Conflicts: addons/attach/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/magazinerepack/stringtable.xml addons/overheating/stringtable.xml extensions/CMakeLists.txt		2015-04-14 19:09:57 -03:00
..
advanced_ballistics	Replaced TABs with 4 spaces	2015-04-11 22:24:32 +02:00
breakLine	Improve the way lines are split	2015-04-11 23:39:06 -03:00
build	Cmake framework for cross-platform extensions and building.	2015-04-03 13:46:53 -07:00
common	Cmake framework for cross-platform extensions and building.	2015-04-03 13:46:53 -07:00
fcs	Make the fcs extension compile without C++11	2015-04-12 00:42:58 -03:00
CMakeLists.txt	Merge branch 'master' into linearMenuExperiment	2015-04-14 19:09:57 -03:00