From kde-commits  Sat Feb 05 20:26:41 2011
From: Jeremy Paul Whiting <jpwhiting () kde ! org>
Date: Sat, 05 Feb 2011 20:26:41 +0000
To: kde-commits
Subject: KDE/kdeedu
Message-Id: <20110205202641.7601AAC8C8 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129693763820689

SVN commit 1219034 by whiting:

move cantor documentation from doc/cantor back to cantor/doc

 M  +1 -0      cantor/CMakeLists.txt  
 A             cantor/doc/CMakeLists.txt   doc/cantor/CMakeLists.txt#1219027
 A             cantor/doc/index.docbook   doc/cantor/index.docbook#1219027
 A             cantor/doc/latex_formula.eps   doc/cantor/latex_formula.eps#1219027
 A             cantor/doc/latex_formula.png   doc/cantor/latex_formula.png#1219027
 A             cantor/doc/screenshot.eps   doc/cantor/screenshot.eps#1219027
 A             cantor/doc/screenshot.png   doc/cantor/screenshot.png#1219027
 M  +0 -4      doc/CMakeLists.txt  
 D             doc/cantor (directory)  


--- trunk/KDE/kdeedu/cantor/CMakeLists.txt #1219033:1219034
@@ -18,6 +18,7 @@
 
 include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} )
 
+add_subdirectory( doc )
 add_subdirectory( src )
 add_subdirectory( icons )
 
--- trunk/KDE/kdeedu/doc/CMakeLists.txt #1219033:1219034
@@ -1,7 +1,3 @@
-if(BUILD_cantor)
-  macro_optional_add_subdirectory(cantor)
-endif()
-
 if(BUILD_kalzium)
   macro_optional_add_subdirectory(kalzium)
 endif()