Merge authors: Hakan Küçükyılmaz (hakan-askmonty) ------------------------------------------------------------ revno: 2756 [merge] committer: Hakan Kuecuekyilmaz <hakan@askmonty.org> 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.