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 /.gitattributes | |
| 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 '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..d288fed --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +gen/net/cbaines/suma/R.java -diff |