[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36453] branches/bmesh/blender/extern/ libopenjpeg/CMakeLists.txt: fixed merge error

Joseph Eagar joeedh at gmail.com
Tue May 3 05:06:52 CEST 2011


Revision: 36453
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36453
Author:   joeedh
Date:     2011-05-03 03:06:49 +0000 (Tue, 03 May 2011)
Log Message:
-----------
fixed merge error

Modified Paths:
--------------
    branches/bmesh/blender/extern/libopenjpeg/CMakeLists.txt

Modified: branches/bmesh/blender/extern/libopenjpeg/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/extern/libopenjpeg/CMakeLists.txt	2011-05-03 03:05:15 UTC (rev 36452)
+++ branches/bmesh/blender/extern/libopenjpeg/CMakeLists.txt	2011-05-03 03:06:49 UTC (rev 36453)
@@ -28,12 +28,6 @@
 	.
 )
 
-<<<<<<< .working
-FILE(GLOB SRC *.c except t1_generate_luts.c)
-ADD_DEFINITIONS(-DWITH_OPENJPEG)
-BLENDERLIB(extern_openjpeg "${SRC}" "${INC}")
-#, libtype=['international','player'], priority=[5, 210])
-=======
 set(SRC
 	bio.c
 	cio.c
@@ -80,4 +74,4 @@
 )
 
 blender_add_lib(extern_openjpeg "${SRC}" "${INC}")
->>>>>>> .merge-right.r35190
+




More information about the Bf-blender-cvs mailing list