git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 92284fb 3cc7d98)

author	Mario <zacjardine@y7mail.com>
	Tue, 4 Aug 2015 02:30:37 +0000 (12:30 +1000)
committer	Mario <zacjardine@y7mail.com>
	Tue, 4 Aug 2015 02:30:37 +0000 (12:30 +1000)
commit	0e3eea33053f3a86b7b44b755c31b3147075598e
tree	39ba91ac81af2287b327a3634318abea42dde04e	tree \| snapshot
parent	92284fbdefe87a7d201579e267d71bb7ae4e07a9	commit \| diff
parent	3cc7d984dec10cdbe7131b4b1a2362997d0eeadb	commit \| diff

Merge branch 'master' into Mario/buff_updates

# Conflicts:
# effectinfo.txt
# qcsrc/common/notifications.qh
# qcsrc/common/stats.qh

14 files changed:

_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
effectinfo.txt	diff1 \|	diff2 \|	blob \| history
hud_luma.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal_xhair.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_old.cfg	diff1 \|	diff2 \|	blob \| history
hud_nexuiz.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud_config.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history