Ricky Barrette 4ca015c7cd Merge branch 'v3' ...

Conflicts:
	LocationLib/libs/android-support-v4-r11-googlemaps.jar
	LocationLib/src/com/TwentyCodes/android/fragments/BaseMapFragment.java
	LocationLib/src/com/TwentyCodes/android/location/MidPoint.java
	LocationLib/src/com/TwentyCodes/android/overlays/RadiusOverlay.java

2014-08-31 22:46:12 -04:00

..

.codepro

init commit

2011-12-17 15:43:48 +00:00

.settings

Added files need to build with ant

2012-08-09 13:21:03 -04:00

libs

Merge branch 'v3'

2014-08-31 22:46:12 -04:00

res

Merge branch 'v3'

2014-08-31 22:46:12 -04:00

src/com/TwentyCodes/android

Merge branch 'v3'

2014-08-31 22:46:12 -04:00

.classpath

Import to intelij, started updating to use maps v2

2014-08-30 11:29:50 -04:00

.gitignore

Updated Skyhook library

2012-02-21 10:35:58 -05:00

.project

init commit

2011-12-17 15:43:48 +00:00

AndroidManifest.xml

Import to intelij, started updating to use maps v2

2014-08-30 11:29:50 -04:00

build.xml

Added files need to build with ant

2012-08-09 13:21:03 -04:00

javadoc.xml

init commit

2011-12-17 15:43:48 +00:00

lint.xml

Fixed some lint errors

2012-06-03 11:36:00 -04:00

local.properties

Added files need to build with ant

2012-08-09 13:21:03 -04:00

LocationLib.iml

Import to intelij, started updating to use maps v2

2014-08-30 11:29:50 -04:00

proguard-project.txt

Added files need to build with ant

2012-08-09 13:21:03 -04:00

project.properties

Import to intelij, started updating to use maps v2

2014-08-30 11:29:50 -04:00