]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eeb1f1b 8014524)
Merge branch 'master' into nyov/more-lineedit-fanciness nyov/more-lineedit-fanciness
authornyov <nyov@nexnode.net>
Sat, 28 Apr 2012 21:31:19 +0000 (23:31 +0200)
committernyov <nyov@nexnode.net>
Sat, 28 Apr 2012 21:31:19 +0000 (23:31 +0200)
1  2 
quakedef.h patch | diff1 | diff2 | blob | history

diff --cc quakedef.h
Simple merge