List:Commits« Previous MessageNext Message »
From:paul.dubois Date:October 21 2010 11:51pm
Subject:svn commit - mysqldoc@docsrva: r23292 - in trunk: . mysql-enterprise-backup-3.5
View as plain text  
Author: paul
Date: 2010-10-22 01:51:09 +0200 (Fri, 22 Oct 2010)
New Revision: 23292

Log:
 r64527@frost:  paul | 2010-10-21 18:32:40 -0500
 Add MEB 3.5 to main Makefile directory list, update dependencies


Modified:
   trunk/Makefile
   trunk/mysql-enterprise-backup-3.5/Makefile.depends

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43425
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64526
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43425
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64527
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-10-21 23:51:03 UTC (rev 23291)
+++ trunk/Makefile	2010-10-21 23:51:09 UTC (rev 23292)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 671 bytes

@@ -15,10 +15,14 @@
 	internals \
 	innodb-plugin-1.0 \
 	innodb-plugin-1.1 \
+	mysql-backup \
+	mysql-enterprise-backup-3.5 \
+	mysql-monitor-2.0 \
+	mysql-monitor-2.1 \
+	mysql-monitor-common \
 	mysqldoc-guide \
 	mysqltest-1.0 \
 	mysqltest-2.0 \
-	mysql-backup \
 	ndbapi \
 	proto-doc \
 	quick-guides \

@@ -29,9 +33,6 @@
 	refman-5.6 \
 	refman-6.0 \
 	refman-6.0-stub \
-	mysql-monitor-common \
-	mysql-monitor-2.0 \
-	mysql-monitor-2.1 \
 	refman-common \
 	sample-data \
 	topic-guides \


Modified: trunk/mysql-enterprise-backup-3.5/Makefile.depends
===================================================================
--- trunk/mysql-enterprise-backup-3.5/Makefile.depends	2010-10-21 23:51:03 UTC (rev 23291)
+++ trunk/mysql-enterprise-backup-3.5/Makefile.depends	2010-10-21 23:51:09 UTC (rev 23292)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 579 bytes

@@ -26,7 +26,6 @@
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
 	../innodb-plugin-1.1/metadata/glossary-core.idmap \
-	../refman-5.5/metadata/preface-core.idmap \
 	metadata/manual.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)


Thread
svn commit - mysqldoc@docsrva: r23292 - in trunk: . mysql-enterprise-backup-3.5paul.dubois22 Oct