]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72a029f 55c3001)
Merge branch 'master' into divVerent/libavcodec
authorRudolf Polzer <divverent@xonotic.org>
Fri, 3 Jun 2011 20:15:57 +0000 (22:15 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 3 Jun 2011 20:15:57 +0000 (22:15 +0200)
1  2 
cl_screen.c patch | diff1 | diff2 | blob | history
client.h patch | diff1 | diff2 | blob | history
makefile.inc patch | diff1 | diff2 | blob | history

diff --cc cl_screen.c
Simple merge
diff --cc client.h
Simple merge
diff --cc makefile.inc
Simple merge