Starting sunlight experimentation branch
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
Fix OSX app/ub scripts
Fix typo preventing OSX native compiles
Add sunlight/lightmap merging by multiply (r_sunlightMode 1)
Merge additive sunlight and map lighting into one GLSL shader (r_sunlightMode 2)
Change single lightmap blends to use lightall
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
Fix setting CVAR_VM_CREATED flag on user created cvars

Fix setting CVAR_VM_CREATED flag on cvars created using set[asu] commands (including archived cvars from cfg) and trap_Cvar_Set.

trap_Cvar_Register called Cvar_Get which cleared CVAR_USER_CREATED flag, but CVAR_VM_CREATED wasn't set because the cvar already existed.
Fix shfolder.dll not getting freed
Fix zone memory leak in OpenGL2 renderer

meminfo command showed the dynamic renderer zone amount going up by 1824 bytes each time I reloaded map using map command.
Remove old .mak files from botlib
Fix memmove()

[The lcc source] overrides the libc memmove() with its own implementation,
but that implementation fails to follow the specification. In particular,
it returns NULL rather than memmove()'s first parameter.

GCC now optimizes based on this aspect of the specification, so things go
wrong at runtime.

[Text & patch from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56881#c8]
merge upstream