]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a5aa9b 4e917c7)
Merge branch 'master' into nyov/more-lineedit-fanciness
authornyov <nyov@nexnode.net>
Sun, 5 Feb 2012 21:50:54 +0000 (22:50 +0100)
committernyov <nyov@nexnode.net>
Sun, 5 Feb 2012 21:50:54 +0000 (22:50 +0100)

Trivial merge