]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b90af0a 2622546)
Merge branch 'master' into nyov/more-lineedit-fanciness
authornyov <nyov@nexnode.net>
Fri, 16 Dec 2011 02:16:42 +0000 (03:16 +0100)
committernyov <nyov@nexnode.net>
Fri, 16 Dec 2011 02:16:42 +0000 (03:16 +0100)

Trivial merge