Public Git Hosting - phpmyadmin/crack.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 6f35aaa 4925260)

commit	47fdfad3361fc5840776060c2326505de1512ee3
author	Madhura Jayaratne <madhura.cj@gmail.com>
	Thu, 21 Jul 2011 22:37:09 +0000 (22 04:07 +0530)
committer	Madhura Jayaratne <madhura.cj@gmail.com>
	Thu, 21 Jul 2011 22:37:09 +0000 (22 04:07 +0530)
tree	e33cd632c8f1ba5d33768db5fa86d4ecd4253739	tree \| snapshot (tar.gz zip)
parent	6f35aaa8e46e1bc50b4b5e38d4b9c4810c5c71ce	commit \| diff
parent	4925260d959d8bd7194b912ddd1317c71f7cc42b	commit \| diff

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

Conflicts:
libraries/gis/pma_gis_geometrycollection.php

13 files changed:

libraries/common.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/display_tbl.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/gis/pma_gis_factory.php	diff1 \|	diff2 \|	blob \| history
libraries/gis/pma_gis_geometrycollection.php	diff1 \|	diff2 \|	blob \| history
libraries/gis/pma_gis_linestring.php	diff1 \|	diff2 \|	blob \| history
libraries/gis/pma_gis_multilinestring.php	diff1 \|	diff2 \|	blob \| history
libraries/gis/pma_gis_multipoint.php	diff1 \|	diff2 \|	blob \| history
libraries/gis/pma_gis_multipolygon.php	diff1 \|	diff2 \|	blob \| history
libraries/gis/pma_gis_point.php	diff1 \|	diff2 \|	blob \| history
libraries/gis/pma_gis_polygon.php	diff1 \|	diff2 \|	blob \| history
libraries/gis/pma_gis_visualization.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