[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38036] branches/soc-2011-tomato: Merging r38023 through r38035 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 38036
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38036
Author:   nazgul
Date:     2011-07-02 11:04:38 +0000 (Sat, 02 Jul 2011)
Log Message:
-----------
Merging r38023 through r38035 from trunk into soc-2011-tomato

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

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

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


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36831-38022
   + /trunk/blender:36831-38035

Modified: branches/soc-2011-tomato/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/source/creator/CMakeLists.txt      2011-07-02 
10:35:58 UTC (rev 38035)
+++ branches/soc-2011-tomato/source/creator/CMakeLists.txt      2011-07-02 
11:04:38 UTC (rev 38036)
@@ -417,7 +417,7 @@
        )
 
        install(  # same as linux!, deduplicate
-               DIRECTORY ${BLENDER_TEXT_FILES}
+               FILES ${BLENDER_TEXT_FILES}
                DESTINATION ${TARGETDIR}
        )
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs