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
..
2d	Remove RAIIdmem::operator pointer	2015-02-17 03:52:59 +00:00
3d	Fix startup trap with D1 shareware data	2015-03-20 03:30:20 +00:00
arch	Merge branch 'unification/master' into unification/rpi	2015-03-21 18:02:16 +01:00
editor	Pass array<> to remap_side_uvs	2015-02-27 03:30:33 +00:00
main	Skip digi_sync_sounds loop if !Viewer	2015-03-15 18:52:52 +00:00
mem	Fix size truncation in mem_malloc	2015-01-29 04:27:35 +00:00
misc	Add automatic demo recording	2015-02-28 19:36:02 +00:00