diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-03-02 11:24:57 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-02 11:24:57 +0000 |
| commit | 7874813b4b682c34f709bf7a465baa8407b2a00f (patch) | |
| tree | 115ed1b33806e139b87a93cedbc564fa41135206 /src/net/cbaines/suma/Stop.java | |
| parent | f58d7d1fc227ed7de50ef5d48a49ff6709f3197b (diff) | |
| parent | e3be46bdee08ad5b336e143861790b705defc0bc (diff) | |
| download | southamptonuniversitymap-7874813b4b682c34f709bf7a465baa8407b2a00f.tar southamptonuniversitymap-7874813b4b682c34f709bf7a465baa8407b2a00f.tar.gz | |
Merge branch 'dev'
Conflicts:
gen/net/cbaines/suma/R.java
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/BusStopSpecificStopView.java
src/net/cbaines/suma/MapActivity.java
Diffstat (limited to 'src/net/cbaines/suma/Stop.java')
| -rw-r--r-- | src/net/cbaines/suma/Stop.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/cbaines/suma/Stop.java b/src/net/cbaines/suma/Stop.java index 3221ed5..9db9978 100644 --- a/src/net/cbaines/suma/Stop.java +++ b/src/net/cbaines/suma/Stop.java @@ -47,7 +47,7 @@ public class Stop { BusStop busStop; /** - * The time that the bus is estimated to arrive + * The time that the bus is estimated to arrive, if this is null, the time is still being loaded */ Date arivalTime; |