]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bc9f1c 4893188)
Merge branch 'master' into terencehill/ca_arena_mutators
authorterencehill <piuntn@gmail.com>
Thu, 14 Mar 2013 21:29:57 +0000 (22:29 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 14 Mar 2013 21:29:57 +0000 (22:29 +0100)
1  2 
_hud_descriptions.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications.qh patch | diff1 | diff2 | blob | history

diff --cc _hud_descriptions.cfg
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/common/notifications.qh
Simple merge