The branch, master has been updated
       via  53ba93b02e8395fb102cae35168133aa244cc155 (commit)
      from  0242446e4682cff050e2c61f151a266b1b86bc83 (commit)


- Log -----------------------------------------------------------------
commit 53ba93b02e8395fb102cae35168133aa244cc155
Author: Michal Čihař <[email protected]>
Date:   Sat Mar 5 15:11:29 2011 +0100

    Remove debug code.
    
    This should never be commited.

-----------------------------------------------------------------------

Summary of changes:
 scripts/update-po |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/update-po b/scripts/update-po
index ac89039..f293467 100755
--- a/scripts/update-po
+++ b/scripts/update-po
@@ -32,8 +32,8 @@ for loc in $LOCS ; do
         s/Project-Id-Version: phpMyAdmin .*/Project-Id-Version: phpMyAdmin 
'$ver'\\n"/;
         ' po/$loc.po
     if [ -f ../localized_docs/po/$loc.po ] ; then
-        msgmerge --previous -C /tmp/po/$loc.po -C ../localized_docs/po/$loc.po 
-U po/$loc.po po/phpmyadmin.pot
+        msgmerge --previous -C ../localized_docs/po/$loc.po -U po/$loc.po 
po/phpmyadmin.pot
     else
-        msgmerge --previous -C /tmp/po/$loc.po -U po/$loc.po po/phpmyadmin.pot
+        msgmerge --previous -U po/$loc.po po/phpmyadmin.pot
     fi
 done


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
What You Don't Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to