]> 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: da42436 6fd078c)
Merge remote-tracking branch 'origin/samual/hud_notify_fontsize'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 16 Feb 2011 06:36:56 +0000 (07:36 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 16 Feb 2011 06:36:56 +0000 (07:36 +0100)
1  2 
hud_luminos.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc hud_luminos.cfg
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge