]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
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)
commit5a5aa9b0bcba9925eab3e4f5bc0cf2c8c1c37cd0
tree1d04072de72289de515516dbf9c130ee99498897
parentb90af0a9b99b3083a78fee406d896463c2fdb0e6
parent2622546207b940ab27d8c7423e2d4af7aef58067
Merge branch 'master' into nyov/more-lineedit-fanciness