diff options
author | Christopher Baines <cbaines8@gmail.com> | 2012-03-09 10:49:50 +0000 |
---|---|---|
committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-09 10:49:50 +0000 |
commit | c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7 (patch) | |
tree | 69ba7ee4c132b2bf6ec138fdcaf0988309b40e56 /assets/routes.csv | |
parent | a32b31c29d45b68918ec2a28fff7d87e675c6768 (diff) | |
parent | 4a45362d8823a84cf9c3c805c006331303a0da33 (diff) | |
download | southamptonuniversitymap-c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7.tar southamptonuniversitymap-c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7.tar.gz |
Merge branch 'dev-search' into dev
Conflicts:
gen/net/cbaines/suma/R.java
res/values/strings.xml
src/net/cbaines/suma/DataManager.java
src/net/cbaines/suma/MapActivity.java
src/net/cbaines/suma/POI.java
Diffstat (limited to 'assets/routes.csv')
-rw-r--r-- | assets/routes.csv | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/assets/routes.csv b/assets/routes.csv deleted file mode 100644 index b536ee7..0000000 --- a/assets/routes.csv +++ /dev/null @@ -1,48 +0,0 @@ -"id","code","label" -427,1,"Southampton - Winchester" -464,1,"City - Weston" -333,10,"Lordshill - City Centre - Thor" -438,10s,"Southampton - Totton - Cadnam" -449,11s,"City-Sholing Loop" -437,12s,"Southampton - Totton - Cadnam" -472,14,"Southampton City Centre - Bitt" -339,16,"Hamble - City" -340,17s,"Lordshill - City - Weston" -376,18,"Thornhill - City - Millbrook" -428,2,"Southampton - Fair Oak" -331,21,"RSH Hospital - City - Nursling" -429,3,"Southampton - Botley" -323,3,"City - Townhill Park" -446,4,"City - Totton" -432,4,"Southampton - Romsey" -424,46,"Southampton - Winchester" -447,5,"Lordshill - City" -421,56,"Southampton - Lymington" -384,6,"Southampton - Lymington" -452,612,"Woolston - Barton Peveril" -448,7,"City-Swaythling" -494,7,"Southampton - Bishops Waltham" -409,72,"Southampton - Gosport" -466,78C,"Southampton - Fareham" -431,8,"Southampton - Hythe" -412,80,"Southampton - Fareham" -480,8A,"City - Hedge End" -341,8s,"Lordshill - City - Midanbury" -434,9,"Southampton - Calshot" -399,9s,"City - Harefield" -433,A,"Eastleigh - Hamble" -357,BSH,"Bitterne Shoppa Hoppa" -455,LINK,"Town Quay - Southampton Centra" -473,N12,"Leisure World - Totton" -462,N16,"City - Hamble" -441,N18,"City - Townhill" -442,N19,"City - Lords Hill" -495,N3,"Soton - Hedge End" -474,S1,"Shirley to Lordshill Centre" -479,S2,"City - Shirley via Tesco" -326,U1,"NOC - Parkway - Eastleigh" -468,U1N,"Leisure World - City Centre -" -329,U2,"Civic Centre - Highfield Campu" -327,U6,"Dock Gate 4 - General Hospital" -354,U9,"Townhill Park - General Hospit" -423,X7,"Southampton - Salisbury" |