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

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

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

author	terencehill <piuntn@gmail.com>
	Thu, 20 Jan 2011 22:12:55 +0000 (23:12 +0100)
committer	terencehill <piuntn@gmail.com>
	Thu, 20 Jan 2011 22:12:55 +0000 (23:12 +0100)
commit	fc3e13dd48a3e16c4173617475adc240ace548fe
tree	b6e7dea2368a51818fefd246c12a9eea53179147	tree \| snapshot
parent	5e4c09a4c9fceb1dfe3c71ce7c57580faee9a5f8	commit \| diff
parent	0209288d556022db3c72b07e25da1d20e00f9337	commit \| diff

Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/Main.qc
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
qcsrc/menu/xonotic/dialog_hudpanel_powerups.c
qcsrc/menu/xonotic/dialog_hudpanel_score.c
qcsrc/menu/xonotic/dialog_hudpanel_weapons.c
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/menu/xonotic/dialog_settings_misc.c

Always a pleasure to resolve conflicts............

19 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	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 \|	\|	blob \| history
qcsrc/client/main.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/classes.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_hudpanel_powerups.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_hudpanel_score.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_hudpanel_weapons.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_settings_misc.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/mainwindow.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	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 \|	\|	blob \| history
qcsrc/client/main.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/classes.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_hudpanel_powerups.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_hudpanel_score.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_hudpanel_weapons.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_settings_misc.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/mainwindow.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history