]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2de0047 d6f8468)
Merge branch 'master' into nyov/more-lineedit-fanciness
authornyov <nyov@nexnode.net>
Mon, 12 Mar 2012 10:58:38 +0000 (11:58 +0100)
committernyov <nyov@nexnode.net>
Mon, 12 Mar 2012 10:58:38 +0000 (11:58 +0100)

Trivial merge