[Commits] Rev 2861: fix bad merge that broke make distcheck in http://bazaar.launchpad.net/~maria-captains/maria/5.2/

serg at askmonty.org serg at askmonty.org
Tue Sep 14 12:40:25 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2861
revision-id: sergii at pisem.net-20100914094021-1b547gccf240v66z
parent: sergii at pisem.net-20100914093906-6hm5qfxdbetxkfb9
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Tue 2010-09-14 11:40:21 +0200
message:
  fix bad merge that broke make distcheck
-------------- next part --------------
=== modified file 'sql-common/Makefile.am'
--- a/sql-common/Makefile.am	2010-09-11 18:43:48 +0000
+++ b/sql-common/Makefile.am	2010-09-14 09:40:21 +0000
@@ -14,4 +14,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ## Process this file with automake to create Makefile.in
-EXTRA_DIST = client.c pack.c my_time.c my_user.c
+EXTRA_DIST = client.c pack.c my_time.c my_user.c client_plugin.c



More information about the commits mailing list