Changeset 300 for code/branches/merger/bin

Timestamp:

Nov 28, 2007, 2:12:56 AM (17 years ago)

Author:

nicolasc

Message:

initial merge of main_reto

Location:

code/branches/merger/bin

Files:

• CMakeCache.txt (copied) (copied from code/branches/main_reto/bin/CMakeCache.txt)
• resources.cfg (modified) (1 diff)

code/branches/merger/bin/resources.cfg

@@ -9 +9 @@
 FileSystem=../Media/fonts
 #FileSystem=../Media/materials/programs
-#FileSystem=../Media/materials/scripts
-#FileSystem=../Media/materials/textures
-#FileSystem=../Media/models
-#FileSystem=../Media/overlays
+FileSystem=../Media/materials/scripts
+FileSystem=../Media/materials/textures
+FileSystem=../Media/models
+FileSystem=../Media/overlay
 #FileSystem=../Media/particle
 FileSystem=../Media/gui
-#FileSystem=../Media/DeferredShadingMedia
-#Zip=../Media/packs/cubemap.zip
+Zip=../Media/packs/cubemap.zip
 #Zip=../Media/packs/cubemapsJS.zip
 #Zip=../Media/packs/dragon.zip