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 |
||
---|---|---|
.. | ||
2d | ||
3d | ||
arch | ||
editor | ||
main | ||
mem | ||
misc |