diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-24 15:01:41 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-24 15:01:41 +0000 |
| commit | 59f31dd97ddc3f3f918a432ea4e20552c3006d97 (patch) | |
| tree | 7477656e08f6aaff1849d25cd593cd0510bc7d1f /res/raw/ormlite_config.txt | |
| parent | 46143c64dbdcbbfb478b2df4949c617682427d63 (diff) | |
| parent | a02e8ae9eed3b2e3c105db19e84c27a0774172dd (diff) | |
| download | southamptonuniversitymap-59f31dd97ddc3f3f918a432ea4e20552c3006d97.tar southamptonuniversitymap-59f31dd97ddc3f3f918a432ea4e20552c3006d97.tar.gz | |
Merge branch 'dev' into dev-rdf
Conflicts:
src/net/cbaines/suma/BuildingActivity.java
Diffstat (limited to 'res/raw/ormlite_config.txt')
| -rw-r--r-- | res/raw/ormlite_config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/raw/ormlite_config.txt b/res/raw/ormlite_config.txt index 60f9ade..2268ae9 100644 --- a/res/raw/ormlite_config.txt +++ b/res/raw/ormlite_config.txt @@ -1,3 +1,3 @@ # -# generated on 2012/02/01 07:59:58 +# generated on 2012/02/19 09:50:39 # |