Public Git Hosting - phpmyadmin.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c67340d d7192b3)

commit	52550eff13b6dca702539946fbdd1ac12e80f107
author	Crack <piotrprz@gmail.com>
	Tue, 20 Jul 2010 10:19:21 +0000 (20 12:19 +0200)
committer	Crack <piotrprz@gmail.com>
	Tue, 20 Jul 2010 10:19:21 +0000 (20 12:19 +0200)
tree	85a8d94dfe9294ee742e7f28512bbf1beb9e2b54	tree \| snapshot (tar.gz zip)
parent	c67340d023eaeb147e0b28155a55db64c8e1598a	commit \| diff
parent	d7192b3a95bbaef2fccbd34ab57accb077085b4d	commit \| diff

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Resolved conflicts:
setup/lib/forms.inc.php
setup/lib/messages.inc.php

Documentation.html	diff1 \|	diff2 \|	blob \| history
export.php	diff1 \|	diff2 \|	blob \| history
libraries/common.inc.php	diff1 \|	diff2 \|	blob \| history
libraries/config.default.php	diff1 \|	diff2 \|	blob \| history
libraries/config.values.php	diff1 \|	diff2 \|	blob \| history
libraries/config/messages.inc.php	diff1 \|	\|	blob \| history
libraries/config/setup.forms.php	diff1 \|	\|	blob \| history

phpMyAdmin