[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 00:29:40 EEST 2010


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

------------------------------------------------------------
revno: 2861
revision-id: sergii at pisem.net-20100913212933-yqtqhyp6dz3godce
parent: sergii at pisem.net-20100913183152-eighgzfb7h9qx279
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Mon 2010-09-13 23:29:33 +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-13 21:29:33 +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