Merge branch 'v3'

Browse Source

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

...

This commit is contained in:

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

2 parents 85f1c8c606 b5e1984c0f

commit 4ca015c7cd

17 files changed

+224 -688

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

LocationLib/libs/.gitkeep

Whitespace-only changes.