Public Git Hosting - phpmyadmin/crack.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 16a0393 9147f30)

commit	7d7dd02e8cd2048f3e11585da86892bf7c4a6dea
author	Madhura Jayaratne <madhura.cj@gmail.com>
	Sat, 13 Aug 2011 08:42:46 +0000 (13 14:12 +0530)
committer	Madhura Jayaratne <madhura.cj@gmail.com>
	Sat, 13 Aug 2011 08:42:46 +0000 (13 14:12 +0530)
tree	bb117e1cc1373cd241cba7372b136e7a8ed45a30	tree \| snapshot (tar.gz zip)
parent	16a039392b4a8ea028b38f969ef7e4e586532b94	commit \| diff
parent	9147f30dc6b00dc63c998f1d2d3972d1a47e6c57	commit \| diff

Merge branch 'master' into OpenGIS

Conflicts:
tbl_select.php

14 files changed:

js/messages.php	diff1 \|	diff2 \|	blob \| history
js/sql.js	diff1 \|	diff2 \|	blob \| history
js/tbl_select.js	diff1 \|	diff2 \|	blob \| history
libraries/common.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/config.default.php	diff1 \|	diff2 \|	blob \| history
libraries/display_tbl.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/import.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/tbl_select.lib.php	\|	diff2 \|	blob \| history
sql.php	diff1 \|	diff2 \|	blob \| history
tbl_change.php	diff1 \|	diff2 \|	blob \| history
tbl_replace.php	diff1 \|	diff2 \|	blob \| history
tbl_select.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