Public Git Hosting - phpmyadmin/crack.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 9c316b7 c00b1e5)

commit	0e8492769354e5b5e2187d4fcda73f174c8f0417
author	Madhura Jayaratne <madhura.cj@gmail.com>
	Mon, 8 Aug 2011 02:15:53 +0000 (8 07:45 +0530)
committer	Madhura Jayaratne <madhura.cj@gmail.com>
	Mon, 8 Aug 2011 02:15:53 +0000 (8 07:45 +0530)
tree	f7a632e533dcd373dee5a9419abe6e93d0d54fea	tree \| snapshot (tar.gz zip)
parent	9c316b7b1158b9207c8a87d04ddbedebac1a42dc	commit \| diff
parent	c00b1e54a132b294d2c5675c27fb4e4908fc349d	commit \| diff

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

Conflicts:
libraries/common.lib.php

js/messages.php	diff1 \|	diff2 \|	blob \| history
js/sql.js	diff1 \|	diff2 \|	blob \| history
js/tbl_change.js	diff1 \|	diff2 \|	blob \| history
js/tbl_gis_visualization.js	diff1 \|	diff2 \|	blob \| history
libraries/common.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/display_tbl.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/gis/pma_gis_visualization.php	diff1 \|	diff2 \|	blob \| history
libraries/import.lib.php	diff1 \|	diff2 \|	blob \| history
sql.php	diff1 \|	diff2 \|	blob \| history
themes/original/css/theme_right.css.php	diff1 \|	diff2 \|	blob \| history
themes/pmahomme/css/theme_right.css.php	diff1 \|	diff2 \|	blob \| history

Drizzle / GSOC 2011