Context Navigation

fightInOurBack.oxw

Timestamp:

Aug 30, 2012, 11:08:17 PM (13 years ago)

Author:

landauf

Message:

merged branch presentation2012merge back to trunk

Location:

code/trunk

Files:

Property svn:ignore

Property svn:mergeinfo changed

/code/branches/newlevel2012 (added)	merged: 9033,9066,9094-9098,9103-9104,9106,9108-9113,9116-9117,9122-9124,9129,9132-9146,9148-9149,9154,9160-9161,9167-9168,9172-9173,9175,9180-9181,9188,9190,9193-9194,9196,9199,9204,9207,9211,9213,9236
/code/branches/pCuts (added)	merged: 9023-9024,9027,9081-9092
/code/branches/pickup2012 (added)	merged: 9029,9099,9118-9119,9155,9184
/code/branches/presentation2012 (added)	merged: 9189,9195,9202-9203,9208,9216,9229,9241,9243-9248,9250,9268
/code/branches/presentation2012merge (added)	merged: 9266,9269-9282,9286-9287,9290-9306,9312-9314,9316,9318-9334,9336-9347
/code/branches/shipSelection (added)	merged: 9038-9039,9045-9046,9057,9074,9101,9127-9128,9157,9185,9201
/code/branches/sound2012 (added)	merged: 9205,9214
/code/branches/surfaceRace (added)	merged: 9028,9035-9037,9041,9056,9059,9061,9070-9071,9107,9120-9121,9130,9150,9162,9169,9171,9174,9187

r9016	r9348
121	121	<Scene
122	122	ambientlight="0.8,0.8,0.8"
123		skybox="Orxonox/sky~~panoramagen1~~"
	123	skybox="Orxonox/skyBoxBasic"
124	124	>
125	125

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