[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38034] branches/soc-2011-salad: svn merge with trunk -r38033

[Antony Riakiotakis]

Revision: 38034
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38034
Author:   psy-fi
Date:     2011-07-02 10:33:51 +0000 (Sat, 02 Jul 2011)
Log Message:
-----------
svn merge with trunk -r38033

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38033

Modified Paths:
--------------
    branches/soc-2011-salad/source/creator/CMakeLists.txt

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-38024
/trunk/blender:36834-38022
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-38024
/trunk/blender:36834-38033

Modified: branches/soc-2011-salad/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/source/creator/CMakeLists.txt	2011-07-02 09:27:35 UTC (rev 38033)
+++ branches/soc-2011-salad/source/creator/CMakeLists.txt	2011-07-02 10:33:51 UTC (rev 38034)
@@ -417,7 +417,7 @@
 	)
 
 	install(  # same as linux!, deduplicate
-		DIRECTORY ${BLENDER_TEXT_FILES}
+		FILES ${BLENDER_TEXT_FILES}
 		DESTINATION ${TARGETDIR}
 	)