[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1426
Date       : Mon Jul 10 17:36:28 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/menuops.cpp
   M /Trunk/XaraLX/configure.in

Pre 0.6 changes


Diff:
Index: Trunk/XaraLX/Kernel/menuops.cpp
===================================================================
--- Trunk/XaraLX/Kernel/menuops.cpp	(revision 1425)
+++ Trunk/XaraLX/Kernel/menuops.cpp	(revision 1426)
@@ -1586,7 +1586,7 @@
 
 	ERRORIF(!IndexOp, _R(IDE_NOMORE_MEMORY), FALSE);
 
-
+#if defined(ENABLE_MOVIES)
 	// REGOP(HELP, DEMOS, HelpOps);
 	OpDescriptor* DemosOp = new OpDescriptor(
 												0, 
@@ -1613,6 +1613,7 @@
 												0 );
 
 	ERRORIF(!DemosNativeOp, _R(IDE_NOMORE_MEMORY), FALSE);
+#endif
 
 	//Webster_Ranbir_12	\96
 #ifdef INC_WEB_MENU_ITEMS
Index: Trunk/XaraLX/configure.in
===================================================================
--- Trunk/XaraLX/configure.in	(revision 1425)
+++ Trunk/XaraLX/configure.in	(revision 1426)
@@ -1,6 +1,6 @@
 AC_INIT(wxOil/camelot.cpp)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(XaraLX, 0.5)
+AM_INIT_AUTOMAKE(XaraLX, 0.6)
 
 # BinReloc sets CFLAGS and CXXFLAGS, so we have to undo this
 inCFLAGS=$CFLAGS


Xara