]> de.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: b3a4b14 e97b644)
Merge remote-tracking branch 'origin/terencehill/centerprint_stuff'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 27 Aug 2011 14:19:29 +0000 (16:19 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 27 Aug 2011 14:19:29 +0000 (16:19 +0200)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/common/constants.qh
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge