PabstMirror 4a8344e1a4 Merge branch 'master' into userActionPrototype ...

Conflicts:
	addons/interact_menu/ACE_Settings.hpp
	addons/interact_menu/stringtable.xml
	extensions/CMakeLists.txt

2015-06-13 15:05:57 -05:00

..

advanced_ballistics

Changed speed of sound to double

2015-05-31 14:21:25 +02:00

break_line

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

build

Cmake framework for cross-platform extensions and building.

2015-04-03 13:46:53 -07:00

clipboard

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

cmake

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

common

Merge remote-tracking branch 'origin/release' into master-fix

2015-05-20 19:31:55 +02:00

dynload

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

fcs

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

lib

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

medical

cross-platform compat integration for medical (history rewrite from gay merge).

2015-05-21 08:43:02 -07:00

parse_imagepath

Extension framework changes

2015-05-17 04:05:43 -05:00

CMakeLists.txt

Merge branch 'master' into userActionPrototype

2015-06-13 15:05:57 -05:00