]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/gettextizing-the-source
authorRudolf Polzer <divverent@alientrap.org>
Sun, 16 Jan 2011 21:53:35 +0000 (22:53 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 16 Jan 2011 21:53:35 +0000 (22:53 +0100)
commit5eafbda9690a04118ae0e1fac02b5e4cfacf7cd1
tree84f60bcde89f4e2b730266f844c04f9a8cb6dcb7
parentfd4364434b39580a06cd89d37552c1adb0bc2897
parent85005e89329c512385edfddb3d493a4e850b829e
Merge branch 'master' into divVerent/gettextizing-the-source
qcsrc/menu/xonotic/dialog_news.c
qcsrc/menu/xonotic/slider_resolution.c