]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd43644 85005e8)
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 patch | diff1 | diff2 | blob | history
qcsrc/menu/xonotic/slider_resolution.c patch | diff1 | diff2 | blob | history

diff --cc qcsrc/menu/xonotic/dialog_news.c
Simple merge