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)
1  2 
qcsrc/menu/xonotic/dialog_news.c
qcsrc/menu/xonotic/slider_resolution.c

Simple merge