[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_2_11, updated. RELEASE_2_11_10-3-g8ae41bb
Michal Čihař
nijel at users.sourceforge.net
Thu Mar 11 13:56:54 CET 2010
The branch, QA_2_11 has been updated
via 8ae41bbc0238581d5e0e692e4dc67e35ded00170 (commit)
via 8535d48ae9c8ea554393802db68dbc9ec571b864 (commit)
from f175026ff0d873c5c73bc841697596e995e271b9 (commit)
- Log -----------------------------------------------------------------
commit 8ae41bbc0238581d5e0e692e4dc67e35ded00170
Merge: f175026ff0d873c5c73bc841697596e995e271b9 8535d48ae9c8ea554393802db68dbc9ec571b864
Author: Michal Čihař <mcihar at novell.com>
Date: Thu Mar 11 13:51:07 2010 +0100
Merge remote branch 'origin/MAINT_2_11_10' into QA_2_11
Conflicts:
ChangeLog
Documentation.html
README
libraries/Config.class.php
translators.html
-----------------------------------------------------------------------
Summary of changes:
README | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/README b/README
index 4936744..46099cc 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ phpMyAdmin - Readme
http://www.phpmyadmin.net/
Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
- Copyright (C) 2001-2008 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca>
+ Copyright (C) 2001-2009 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca>
Olivier Müller <om_at_omnis.ch>
Robin Johnson <robbat2_at_users.sourceforge.net>
Alexander M. Turek <me_at_derrabus.de>
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list