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

..

.gitkeep

Import to intelij, started updating to use maps v2

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

android-support-v4-r11-googlemaps.jar

Updated support libray to r11

2012-12-11 11:31:55 -05:00