Planet

navi

home

PPS

about

screenshots

download

development

forum

Context Navigation

← Previous Change
Next Change →

Changeset 9922 for code/branches/presentationHS13/src

Timestamp:

Dec 18, 2013, 11:43:30 AM (11 years ago)

Author:

jo

Message:

merged levelMichael

Location:

code/branches/presentationHS13

Files:

: 3 edited
: 2 copied

. (modified) (1 prop)
src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
src/modules/overlays/hud/CountDown.cc (copied) (copied from code/branches/levelMichael/src/modules/overlays/hud/CountDown.cc)
src/modules/overlays/hud/CountDown.h (copied) (copied from code/branches/levelMichael/src/modules/overlays/hud/CountDown.h)

Legend:

: Unmodified
: Added
: Removed

code/branches/presentationHS13

Property svn:mergeinfo changed

/code/branches/levelMichael (added)

merged: 9696,9718,9722,9726-9727,9731,9735,9738,9741,9743,9746,9750-9752,9757-9758,9767,9769,9778,9784-9786,9788,9791,9806,9809,9822-9823,9826,9843,9849,9870,9872-9873,9883,9888,9892,9894

code/branches/presentationHS13/src/modules/overlays/OverlaysPrereqs.h

r9526	r9922
80	80	class BarColour;
81	81	class ChatOverlay;
	82	class CountDown;
82	83	class DeathMessage;
83	84	class GametypeFadingMessage;

code/branches/presentationHS13/src/modules/overlays/hud/CMakeLists.txt

r9348	r9922
18	18	PauseNotice.cc
19	19	LastTeamStandingInfos.cc
	20	CountDown.cc
20	21	)

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: