]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
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)
commit7957ab8de3b8237fef3879586819b37b52e5283d
tree786b7a4514856f6847c908ff10e7cf8f9edfeb1d
parent5a5aa9b0bcba9925eab3e4f5bc0cf2c8c1c37cd0
parent4e917c714cb66459bc448d983a45d57b616bb154
Merge branch 'master' into nyov/more-lineedit-fanciness