]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
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)
commit517054f1dafc14c5e3f8cfd540cad10a1435593d
treefb0f4693d23f5343ffb1a02326f0b8954482e920
parent2de004752fd997acfab591b4aa910d8f5ab0348a
parentd6f8468a651dc24bae9974b0b37e4d1fb04cacda
Merge branch 'master' into nyov/more-lineedit-fanciness