derhass a8283a9d45 Merge branch 'unification/master' into unification/rpi ... Kp already incorporated some small changes I made in my rpi branch into unification/master. However, besides making the rpi helper functions static as I did, he also changed the prototype from (void) parameters to C++ style (). I've incorporated his version here. Conflicts: similar/arch/ogl/gr.cpp		2015-03-21 18:02:16 +01:00
common	ಠ_ಠ	2015-03-20 17:31:22 -04:00
contrib	xcode setting for passing network opts to scons	2015-02-05 17:02:17 -08:00
d1x-rebirth	Use array<> for robot_info	2015-02-28 19:36:01 +00:00
d2x-rebirth	Fix resource leak closing SDL RW ops	2015-02-28 22:34:07 +00:00
similar	Merge branch 'unification/master' into unification/rpi	2015-03-21 18:02:16 +01:00
.gitignore	ignore XCode user data	2014-12-06 22:43:12 -08:00
COPYING.txt	corrected typo in COPYING.txt (it's to its)	2014-06-06 13:18:52 +02:00
GPL-3.txt	Changed custom D1X license to GPLv3	2014-06-01 19:55:23 +02:00
SConstruct	RPi: use CPPFLAGS instead of CXXFLAGS for -isystem	2015-03-21 17:54:04 +01:00