Author: paul
Date: 2008-05-20 17:56:27 +0200 (Tue, 20 May 2008)
New Revision: 10787
Log:
r31559@frost: paul | 2008-05-20 10:57:04 -0500
Update dependencies
Modified:
trunk/refman-5.1-maria/Makefile.depends
trunk/refman-5.1/Makefile.depends
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31556
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31325
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31559
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31325
Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends 2008-05-20 15:38:46 UTC (rev 10786)
+++ trunk/refman-5.1/Makefile.depends 2008-05-20 15:56:27 UTC (rev 10787)
Changed blocks: 4, Lines Added: 0, Lines Deleted: 4; 2020 bytes
@@ -730,7 +730,6 @@
../refman-5.1/metadata/mysql-cluster-news-core.idmap \
../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
../refman-5.1/metadata/mysql-cluster-process-management.idmap \
- ../refman-5.1/metadata/mysql-cluster-replication-conflict-resolution.idmap \
../refman-5.1/metadata/mysql-cluster-replication.idmap \
../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
../refman-5.1/metadata/mysql-cluster-utilities.idmap \
@@ -1761,7 +1760,6 @@
../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
../refman-5.1/metadata/mysql-cluster-overview.idmap \
../refman-5.1/metadata/mysql-cluster-process-management.idmap \
- ../refman-5.1/metadata/mysql-cluster-replication-conflict-resolution.idmap \
../refman-5.1/metadata/mysql-cluster-replication.idmap \
../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
../refman-5.1/metadata/mysql-cluster-security.idmap \
@@ -2142,7 +2140,6 @@
../refman-5.1/metadata/dba-core.idmap \
../refman-5.1/metadata/mysql-cluster-backup.idmap \
../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
- ../refman-5.1/metadata/mysql-cluster-replication-conflict-resolution.idmap \
../refman-5.1/metadata/mysql-cluster-replication.idmap \
../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
../refman-5.1/metadata/news-5.1-core.idmap \
@@ -2356,7 +2353,6 @@
../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
../refman-5.1/metadata/mysql-cluster-overview.idmap \
../refman-5.1/metadata/mysql-cluster-process-management.idmap \
- ../refman-5.1/metadata/mysql-cluster-replication-conflict-resolution.idmap \
../refman-5.1/metadata/mysql-cluster-replication.idmap \
../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
../refman-5.1/metadata/mysql-cluster-security.idmap \
Modified: trunk/refman-5.1-maria/Makefile.depends
===================================================================
--- trunk/refman-5.1-maria/Makefile.depends 2008-05-20 15:38:46 UTC (rev 10786)
+++ trunk/refman-5.1-maria/Makefile.depends 2008-05-20 15:56:27 UTC (rev 10787)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 634 bytes
@@ -415,7 +415,6 @@
../ndbapi/metadata/ndbapi.idmap \
../quick-guides/metadata/reservedwords-core.idmap \
../refman-5.1-maria/metadata/se-maria.idmap \
- ../refman-5.1/metadata/mysql-cluster-replication-conflict-resolution.idmap \
../refman-5.1/metadata/storage-engines.idmap \
../refman-6.0/metadata/dba-core.idmap \
../refman-6.0/metadata/manual.idmap \
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10787 - in trunk: . refman-5.1 refman-5.1-maria | paul | 20 May |
