* Merge of ioq3-r1163

  + SDL everywhere
  + New R_LoadImage
  + net_ip.c
  + Window icon
  + GUI based dedicated server support
  + Compile time linked OpenGL
* Remove ui_menuFiles cvar

2 files changed, 2 insertions, 4 deletions

diff --git a/src/null/null_client.c b/src/null/null_client.c
index 2b98195c..8346ff93 100644
--- a/src/null/null_client.c
+++ b/src/null/null_client.c
@@ -54,7 +54,7 @@ void CL_MapLoading( void ) {
 }
 
 qboolean CL_GameCommand( void ) {
-  return qfalse; // bk001204 - non-void
+  return qfalse;
 }
 
 void CL_KeyEvent (int key, qboolean down, unsigned time) {
@@ -82,8 +82,7 @@ void CL_CDDialog( void ) {
 void CL_FlushMemory( void ) {
 }
 
-void CL_StartHunkUsers( void ) {
+void CL_StartHunkUsers( qboolean rendererOnly ) {
 }
 
-// bk001119 - added new dummy for sv_init.c
 void CL_ShutdownAll(void) {}
diff --git a/src/null/null_snddma.c b/src/null/null_snddma.c
index 559f2170..995203fd 100644
--- a/src/null/null_snddma.c
+++ b/src/null/null_snddma.c
@@ -48,7 +48,6 @@ void SNDDMA_Submit(void)
 {
 }
 
-// bk001119 - added boolean flag, match client/snd_public.h
 sfxHandle_t S_RegisterSound( const char *name, qboolean compressed ) 
 {
 	return 0;