gitphp 0.2.9.1 :: busui.git/commit

projects / busui.git / commit

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

author	Alexander Sadleir
	Sat, 10 Mar 2012 08:02:21 +0000 (19:02 +1100)
committer	Alexander Sadleir
	Sat, 10 Mar 2012 08:02:21 +0000 (19:02 +1100)
commit	4aab11cb185fdfa17409d8512b881d5d6e9c9093
tree	3664055f6bfc325d2eeb70c10c47bc2dbc1e774f	tree \| snapshot
parent	7cfc800a9181a84676e5e33ff428664dc47b4c2b	commit \| commitdiff
parent	9714b3c938ad66f914c8d22144b8883e40f2ef09	commit \| commitdiff

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

Conflicts:
.gitmodules
myway/myway_timeliness_route.json.php
myway/myway_timeliness_stop.php

446 files changed:

.gitmodules		blob \| diff \| history \| plain
about.php		blob \| diff \| history \| plain
aws/transitdata.sql	[ deleted file ]	blob \| history \| plain
css/jquery-ui-1.8.12.custom.css		blob \| diff \| history \| plain
css/jquery.mobile-b90eab4935.css	[ deleted file ]	blob \| history \| plain
css/local.css.php		blob \| diff \| history \| plain
feedback.php		blob \| diff \| history \| plain
include/common-geo.inc.php		blob \| diff \| history \| plain
include/common-request.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		blob \| diff \| history \| 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/LAB.min.js	[ deleted file ]	blob \| history \| plain
js/jquery-1.6.4.min.js	[ deleted file ]	blob \| history \| plain
js/jquery.mobile-b90eab4935.js	[ deleted file ]	blob \| history \| plain
js/yepnope	[ new directory with mode 0000 ]	blob \| plain
labs/OpenStreetMap.js	[ deleted file ]	blob \| history \| plain
labs/busstopdensity.php	[ deleted file ]	blob \| history \| plain
labs/busstopdensity.tile.php	[ deleted file ]	blob \| history \| plain
labs/googlemaps.php	[ deleted file ]	blob \| history \| plain
labs/gradient/classic.png	[ deleted file ]	blob \| history \| plain
labs/gradient/fire.png	[ deleted file ]	blob \| history \| plain
labs/gradient/pgaitch.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/OpenLayers.js	[ deleted file ]	blob \| history \| plain
labs/openlayers/build/README.txt	[ deleted file ]	blob \| history \| plain
labs/openlayers/build/build.py	[ deleted file ]	blob \| history \| plain
labs/openlayers/build/buildUncompressed.py	[ deleted file ]	blob \| history \| plain
labs/openlayers/build/full.cfg	[ deleted file ]	blob \| history \| plain
labs/openlayers/build/library.cfg	[ deleted file ]	blob \| history \| plain
labs/openlayers/build/license.txt	[ deleted file ]	blob \| history \| plain
labs/openlayers/build/lite.cfg	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/blank.gif	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/cloud-popup-relative.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/drag-rectangle-off.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/drag-rectangle-on.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/east-mini.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/layer-switcher-maximize.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/layer-switcher-minimize.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/marker-blue.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/marker-gold.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/marker-green.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/marker.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/measuring-stick-off.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/measuring-stick-on.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/north-mini.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/panning-hand-off.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/panning-hand-on.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/slider.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/south-mini.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/west-mini.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/zoom-minus-mini.png	[ deleted file ]	blob \| history \| plain
labs/openlayers/img/zoom-plus-mini.png	[ deleted file ]