]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
Merge remote-tracking branch 'origin/master' into divVerent/libavcodec
authorRudolf Polzer <divverent@xonotic.org>
Sun, 29 May 2011 12:45:19 +0000 (14:45 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 29 May 2011 12:45:19 +0000 (14:45 +0200)
commita4f3f7783d04cefce73a34d8f5394f531d59ea21
tree6bdfc309878695c14c17ef2361e8e37466ce21b7
parentb0fd2897f082bec15e75fc8b93182c12b088d5b6
parentbebdddd7765df0b347089323bad3a5ae626f7822
Merge remote-tracking branch 'origin/master' into divVerent/libavcodec
cl_screen.c
client.h
makefile.inc