well luckily thse changes are easy to track if i forgot something. sometimes.
tho many a time i spent a day tracking a bug and looked at a merge and was like doh, forgot a function that's 40 lines of stuff.
some of these are damn tedious, like trap_R_Something vs trap_RSomething or the inclusion of a new param just in case someone wants to use a boolean someplace.
the only reason im merging is because of some renderer/winapp fixes and the demo/network fixes.
