Context Navigation

defaultConfig

Timestamp:

Feb 15, 2012, 11:51:58 PM (13 years ago)

Author:

Message:

Merging presentation2011 branch to trunk. Please check for possible bugs.

Location:

code/trunk

Files:

Property svn:mergeinfo changed

/code/branches/environment3 (added)	merged: 8887,8889,8917,8919,8946-8947,8961,8963,8972
/code/branches/formation (added)	merged: 8885,8908,8939,8943,8948,8953,8957,8965,8967,8978,8985,8989-8991
/code/branches/gamecontent (added)	merged: 8893,8895,8899-8901,8904,8907,8909-8910,8922-8924,8930,8932,8941-8942,8950-8951,8956
/code/branches/hud (added)	merged: 8883,8896-8897,8906,8920,8929,8955,8966,8969,8986
/code/branches/menue (added)	merged: 8884,8890,8894,8912,8914,8916,8927,8931,8938,8945,8958,8964,8975
/code/branches/presentation2011 (added)	merged: 8974,8976-8977,8980-8982,8987-8988,8992-9001,9003,9005-9014
/code/branches/spaceraceTwo (added)	merged: 8881,8898,8911,8915,8918,8921,8928,8934,8940,8944,8949,8954,8959-8960,8968,8970-8971,8979,8983

-                      r8706
+                      r9016
 KeyNumLock=
 KeyNumRow0=
 KeyNumRow1=
 KeyNumRow2=
+KeyNumRow1="toggleFormationFlight"
+KeyNumRow2="FFChangeMode"
 KeyNumRow3=
 KeyNumRow4=

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