Merge remote branch 'origin/master' into akari/irc

Conflicts:
	makefile.inc

diff --cc cl_main.c
Simple merge

diff --cc cl_video.c
Simple merge

diff --cc console.c
Simple merge

diff --cc keys.c
Simple merge

diff --cc makefile.inc
index 01e2999679df0dd3da9635fc6068320b3d5a719c,dd55442a6b02be277ce1d47d08d83582accc6bdb..fc63f7d41fd9ebdaa682ec3a901da2d6b8cf55bf
--- 1/makefile.inc
--- 2/makefile.inc
+++ b/makefile.inc
@@@ -210,9 -209,9 +210,9 @@@ DO_CC=$(CC) $(CFLAGS) -c $< -o $
  
  
  # Link
- LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=debug
- LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=profile
- LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=release -lircclient
+ LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=debug
+ LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=profile
 -LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=release
++LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=release -lircclient
  
  
  ##### UNIX specific variables #####