Context Navigation

InvaderHUDinfo.h

Timestamp:

Dec 21, 2013, 11:16:54 PM (10 years ago)

Author:

Message:

presentationHS13 branch merged into trunk

Location:

code/trunk

Files:

Property svn:mergeinfo changed

/code/branches/invaders (added)	merged: 9694,9698,9701-9702,9709,9724-9725,9744,9777,9793,9828-9829,9837,9854,9858-9859,9862,9866,9868-9869,9871,9874-9875,9879,9884
/code/branches/levelElias (added)	merged: 9697,9712,9732,9747,9772,9810-9811,9815,9848,9887
/code/branches/levelKaan (added)	merged: 9695,9704,9717,9721,9733,9748,9807-9808,9821,9836,9878,9880,9909,9915
/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 (added)	merged: 9891,9898,9900,9902,9904-9905,9907,9910,9918,9920,9922-9926,9928-9930,9932,9934-9935,9937-9938
/code/branches/radarDreiD (added)	merged: 9690,9719,9737,9740,9742,9749,9770-9771,9779,9787,9792,9796,9818,9824,9835,9847,9852,9877,9881-9882,9893
/code/branches/sfxThilo (added)	merged: 9691,9720,9889,9913
/code/branches/spacestationentry (added)	merged: 9699,9705,9708,9710,9713-9715,9745,9776,9789,9820,9857,9885-9886

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