Context Navigation

OverlaysPrereqs.h

Timestamp:

Feb 19, 2013, 10:25:42 AM (11 years ago)

Author:

Message:

Merging presentationHS12 back to the trunk.

Location:

code/trunk

Files:

Property svn:mergeinfo changed

/code/branches/Racingbot (added)	merged: 9388,9399,9412,9432,9436,9441,9451,9459,9470,9487,9490,9507-9508,9512-9513
/code/branches/largeShip1 (added)	merged: 9384,9454-9455,9515
/code/branches/presentationHS12 (added)	merged: 9481,9483,9494,9498,9501,9503,9505,9516,9518-9521,9523,9525
/code/branches/spaceNavigation (added)	merged: 9381,9400,9421,9429,9434-9435,9443-9444,9450,9457,9468,9471-9472,9484,9486,9495-9496
/code/branches/turret (added)	merged: 9380,9460,9469,9489,9497,9499

r9348	r9526
91	91	class HUDBoostBar;
92	92	class HUDTimer;
	93	class HUDAimAssistant;
93	94	class KillMessage;
94	95	class LastManStandingInfos;

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