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
..
gr.cpp	Merge branch 'unification/master' into unification/rpi	2015-03-21 18:02:16 +01:00
ogl.cpp	Remove RAIIdmem::operator pointer	2015-02-17 03:52:59 +00:00