Commit
Merge remote-tracking branch 'origin/Adam' into Bartek

Conflicts:
	trunk/Library/CurrentLayout.dwlt
	trunk/Library/CurrentMaximizeLayout.dwlt
	trunk/Library/assetDatabase3
	trunk/trunk-csharp.sln
	trunk/trunk.sln
Checkout
Merge remote-tracking branch 'origin/Bartek' into Bartek

Conflicts:
	trunk/Library/CurrentLayout.dwlt
	trunk/Library/assetDatabase3
	trunk/Library/expandedItems
	trunk/trunk-csharp.sln
	trunk/trunk.sln
ADDING TERRAIN AND ASSETS
 JS to C#
Merge remote-tracking branch 'origin/Adam' into Bartek

Conflicts:
	trunk/Assembly-CSharp-firstpass-vs.csproj
	trunk/Assembly-CSharp-firstpass.csproj
	trunk/Assembly-CSharp-vs.csproj
	trunk/Assembly-CSharp.csproj
	trunk/Assembly-UnityScript-firstpass-vs.unityproj
	trunk/Assembly-UnityScript-firstpass.unityproj
	trunk/Assembly-UnityScript-vs.unityproj
	trunk/Assembly-UnityScript.unityproj
	trunk/Assets/Scenes/Demo.unity
	trunk/Assets/Scenes/Panzeraby.unity
	trunk/Assets/Textures/milestone Beta.txt.meta
	trunk/Library/CurrentLayout.dwlt
	trunk/Library/InspectorExpandedItems.asset
	trunk/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	trunk/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	trunk/Library/ScriptAssemblies/Assembly-CSharp.dll
	trunk/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	trunk/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	trunk/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	trunk/Library/ScriptAssemblies/Assembly-UnityScript.dll
	trunk/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	trunk/Library/assetDatabase3
	trunk/Library/expandedItems
	trunk/Library/guidmapper
	trunk/Library/metadata/ec/ec2fab74da7a83a4281d4306f74cd39b
	trunk/trunk-csharp.sln
	trunk/trunk.sln
Pruszowski Approved
Temporary commit
Merge branch 'Bartek'

Conflicts:
	trunk/Assembly-CSharp-firstpass-vs.csproj
	trunk/Assembly-CSharp-firstpass.csproj
	trunk/Assembly-CSharp-vs.csproj
	trunk/Assembly-CSharp.csproj
	trunk/Assembly-UnityScript-firstpass-vs.unityproj
	trunk/Assembly-UnityScript-firstpass.unityproj
	trunk/Assembly-UnityScript-vs.unityproj
	trunk/Assembly-UnityScript.unityproj
	trunk/Assets/Textures/milestone Beta.txt.meta
	trunk/Library/CurrentLayout.dwlt
	trunk/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	trunk/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	trunk/Library/ScriptAssemblies/Assembly-CSharp.dll
	trunk/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	trunk/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	trunk/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	trunk/Library/ScriptAssemblies/Assembly-UnityScript.dll
	trunk/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	trunk/Library/assetDatabase3
	trunk/Library/expandedItems
	trunk/Library/guidmapper
	trunk/trunk-csharp.sln
	trunk/trunk.sln