Merge branch 'master' of github.com:maxious/ACTBus-ui
author Maxious
()
committer Maxious
()
commit 3d8840c2a8123c343be8d4ff68edd62138192e72
tree 5f5ae8e559a63cab0cb187b6433ea6c64f6fb0dc
parent 984f67e0c699dc24442837be9eb1dcc4d6153cf4
parent 876c3cc393e68896a7d615189333b1c5edbc6d67
Merge branch 'master' of github.com:maxious/ACTBus-ui
include/common-template.inc.php
include/db/trip-dao.inc.php
js/jquery-1.6.2.min.js [ deleted file ]
js/jquery-1.6.4.min.js [ new file with mode 0644 ]
labs/stopBrowser.kml.php
layar_api.php
stop.php
trip.php