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 /project.properties | |
| 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 'project.properties')
| -rw-r--r-- | project.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project.properties b/project.properties index 5a70945..f049142 100644 --- a/project.properties +++ b/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-7 +target=android-10 |