gitphp 0.2.9.1 :: busui.git/commit

projects / busui.git / commit

Merge branch 'master' of https://github.com/maxious/ACTBus-ui

author	Maxious
	Thu, 02 Jun 2011 08:58:01 +0000 (18:58 +1000)
committer	Maxious
	Thu, 02 Jun 2011 08:58:01 +0000 (18:58 +1000)
commit	535257650610c1a7a745800d36c9624d231309a5
tree	fec57dcc5536d278c35f05a2b011884b1ad7e716	tree \| snapshot
parent	7c94c9ef3775bf81c3d756df3073b9e2848737e9	commit \| commitdiff
parent	e566cba51c5455515506e70d7b12a2983115a8cf	commit \| commitdiff

Merge branch 'master' of https://github.com/maxious/ACTBus-ui

Conflicts:
include/common-db.inc.php

48 files changed:

css/images/ui-bg_diagonals-thick_18_b81900_40x40.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-bg_diagonals-thick_20_666666_40x40.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-bg_flat_10_000000_40x100.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-bg_glass_100_f6f6f6_1x400.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-bg_glass_100_fdf5ce_1x400.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-bg_glass_65_ffffff_1x400.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-bg_gloss-wave_35_f6a828_500x100.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-icons_222222_256x240.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-icons_228ef1_256x240.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-icons_ef8c08_256x240.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-icons_ffd27a_256x240.png	[ new file with mode 0644 ]	blob \| plain
css/images/ui-icons_ffffff_256x240.png	[ new file with mode 0644 ]	blob \| plain
css/jquery-ui-1.8.12.custom.css	[ new file with mode 0644 ]	blob \| plain
css/jquery.ui.datepicker.mobile.css	[ deleted file ]	blob \| history \| plain
include/common-db.inc.php		blob \| diff \| history \| plain
include/common-request.inc.php	[ new file with mode 0644 ]	blob \| plain
include/common-session.inc.php		blob \| diff \| history \| plain
include/common-template.inc.php		blob \| diff \| history \| plain
include/common-transit.inc.php		blob \| diff \| history \| plain
include/common.inc.php		blob \| diff \| history \| plain
include/db/route-dao.inc.php		blob \| diff \| history \| plain
include/db/servicealert-dao.inc.php	[ new file with mode 0644 ]	blob \| plain
include/db/stop-dao.inc.php		blob \| diff \| history \| plain
include/db/trip-dao.inc.php		blob \| diff \| history \| plain
index.php		blob \| diff \| history \| plain
js/jQuery.ui.datepicker.js	[ deleted file ]	blob \| history \| plain
js/jquery.effects.core.js	[ deleted file ]	blob \| history \| plain
js/jquery.ui.autocomplete.js	[ deleted file ]	blob \| history \| plain
js/jquery.ui.autocomplete.min.js	[ new file with mode 0644 ]	blob \| plain
js/jquery.ui.core.min.js	[ new file with mode 0644 ]	blob \| plain
js/jquery.ui.position.js	[ deleted file ]	blob \| history \| plain
js/jquery.ui.position.min.js	[ new file with mode 0644 ]	blob \| plain
js/jquery.ui.widget.js	[ deleted file ]	blob \| history \| plain
js/jquery.ui.widget.min.js	[ new file with mode 0644 ]	blob \| plain
labs/myway_api.json.php		blob \| diff \| history \| plain
labs/mywaybalance.php		blob \| diff \| history \| plain
labs/networkstats.php		blob \| diff \| history \| plain
layar_api.php		blob \| diff \| history \| plain
lib/autocomplete.php	[ new file with mode 0644 ]	blob \| plain
robots.txt		blob \| diff \| history \| plain
routeList.php		blob \| diff \| history \| plain
sitemap.xml.php		blob \| diff \| history \| plain
stop.php		blob \| diff \| history \| plain
stopList.php		blob \| diff \| history \| plain
trip.php		blob \| diff \| history \| plain
tripPlanner.php		blob \| diff \| history \| plain

Unnamed repository; edit this file to name it for gitweb.

RSS Atom

GitPHP by Chris Han