← Back to team overview

maria-developers team mailing list archive

[Branch ~maria-captains/maria/5.1] Rev 2756: Merge.

 

Merge authors:
  Hakan Küçükyılmaz (hakan-askmonty)
------------------------------------------------------------
revno: 2756 [merge]
committer: Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>
branch nick: maria-local-master
timestamp: Sun 2009-11-01 18:41:16 +0100
message:
  Merge.
renamed:
  storage/federatedx/CMakeFiles.txt => storage/federatedx/CMakeLists.txt
modified:
  storage/federatedx/Makefile.am


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.
=== renamed file 'storage/federatedx/CMakeFiles.txt' => 'storage/federatedx/CMakeLists.txt'
=== modified file 'storage/federatedx/Makefile.am'
--- storage/federatedx/Makefile.am	2009-10-30 18:50:56 +0000
+++ storage/federatedx/Makefile.am	2009-11-01 15:09:55 +0000
@@ -34,7 +34,7 @@
 			        federatedx_io_mysql.cc
 
 EXTRA_DIST =		CMakeLists.txt plug.in ha_federatedx.h \
-			federatedx_probes.d
+			federatedx_probes.h
 
 ha_federatedx_la_SOURCES = ha_federatedx.cc federatedx_txn.cc \
 			   federatedx_io.cc federatedx_io_null.cc \