[Phpmyadmin-git] [phpmyadmin/phpmyadmin] afb393: bug #4080 Overwrite existing file not obeyed

2013-09-08 Thread Marc Delisle
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: afb393816dd2fcc8b1ddb402d644d8cbafe6e157
  
https://github.com/phpmyadmin/phpmyadmin/commit/afb393816dd2fcc8b1ddb402d644d8cbafe6e157
  Author: Marc Delisle 
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Changed paths:
M ChangeLog
M export.php

  Log Message:
  ---
  bug #4080 Overwrite existing file not obeyed


  Commit: 97b44acfccc6d6ba40b75a393d616bd912860ae1
  
https://github.com/phpmyadmin/phpmyadmin/commit/97b44acfccc6d6ba40b75a393d616bd912860ae1
  Author: João Rodrigues 
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Changed paths:
M po/pt.po

  Log Message:
  ---
  Translated using Weblate (Portuguese)

Currently translated at 51.9% (1354 of 2609)


  Commit: 5e0a314d70438559aa46bf4607b85d3ec706bf02
  
https://github.com/phpmyadmin/phpmyadmin/commit/5e0a314d70438559aa46bf4607b85d3ec706bf02
  Author: Weblate 
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Changed paths:
M ChangeLog
M export.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0


  Commit: b211ad69db54315fd961157ea02610bfc75cf2d0
  
https://github.com/phpmyadmin/phpmyadmin/commit/b211ad69db54315fd961157ea02610bfc75cf2d0
  Author: Marc Delisle 
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Log Message:
  ---
  Merge commit 'afb3938'


  Commit: 193f06b0afb5409b21a8288a73e4414ac687
  
https://github.com/phpmyadmin/phpmyadmin/commit/193f06b0afb5409b21a8288a73e4414ac687
  Author: Marc Delisle 
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Changed paths:
M ChangeLog
M export.php

  Log Message:
  ---
  Fix merge conflicts


  Commit: 6d1faa7300204804edaf022ca5e1f66972d93e62
  
https://github.com/phpmyadmin/phpmyadmin/commit/6d1faa7300204804edaf022ca5e1f66972d93e62
  Author: Marc Delisle 
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Log Message:
  ---
  Merge commit '5e0a314'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/5e7059725168...6d1faa730020
--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk___
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git


[Phpmyadmin-git] [phpmyadmin/phpmyadmin] afb393: bug #4080 Overwrite existing file not obeyed

2013-09-08 Thread Marc Delisle
  Branch: refs/heads/QA_4_0
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: afb393816dd2fcc8b1ddb402d644d8cbafe6e157
  
https://github.com/phpmyadmin/phpmyadmin/commit/afb393816dd2fcc8b1ddb402d644d8cbafe6e157
  Author: Marc Delisle 
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Changed paths:
M ChangeLog
M export.php

  Log Message:
  ---
  bug #4080 Overwrite existing file not obeyed



--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk___
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git