{"shas":[["8f0517ef5c4985e4496a728f265a7ecf85054f83","a4627d56ab001cc9887df100906aceac5f0ebec4@gmail.com","Merge branch 'gh-pages' of github.com:Xanthanov/Fun-Runner\n\nConflicts:\n\tFunRunApp/javadoc/Makefile\n\tFunRunApp/javadoc/allclasses-frame.html\n\tFunRunApp/javadoc/allclasses-noframe.html\n\tFunRunApp/javadoc/constant-values.html\n\tFunRunApp/javadoc/deprecated-list.html\n\tFunRunApp/javadoc/help-doc.html\n\tFunRunApp/javadoc/index-all.html\n\tFunRunApp/javadoc/index.html\n\tFunRunApp/javadoc/overview-frame.html\n\tFunRunApp/javadoc/overview-summary.html\n\tFunRunApp/javadoc/overview-tree.html\n\tFunRunApp/javadoc/serialized-form.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/ChoosePlaceActivity.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/FunRunActivity.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/FunRunApplication.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/FunRunOverlay.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/FunRunTitle.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/MockFactory.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/PlaceSearcher.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/StepCompleteActivity.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/ViewOldRunActivity.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/ViewStatsActivity.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/adapters/ViewStatsAdapter.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/adapters/package-frame.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/adapters/package-summary.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/adapters/package-tree.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/package-frame.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/package-summary.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/package-tree.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/persist/AbcFileComparator.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/persist/FunRunData.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/persist/RunDataSerializer.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/persist/package-frame.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/persist/package-summary.html\n\tFunRunApp/javadoc/xanthanov/droid/funrun/persist/package-tree.html\n\tFunRunApp/javadoc/xanthanov/droid/gplace/DirectionGetter.html\n\tFunRunApp/javadoc/xanthanov/droid/gplace/GoogleDirections.html\n\tFunRunApp/javadoc/xanthanov/droid/gplace/GoogleLeg.html\n\tFunRunApp/javadoc/xanthanov/droid/gplace/GooglePlace.html\n\tFunRunApp/javadoc/xanthanov/droid/gplace/GoogleStep.html\n\tFunRunApp/javadoc/xanthanov/droid/gplace/LatLng.html\n\tFunRunApp/javadoc/xanthanov/droid/gplace/PlaceComparator.html\n\tFunRunApp/javadoc/xanthanov/droid/gplace/package-frame.html\n\tFunRunApp/javadoc/xanthanov/droid/gplace/package-summary.html\n\tFunRunApp/javadoc/xanthanov/droid/gplace/package-tree.html\n\tFunRunApp/javadoc/xanthanov/droid/xantools/DroidBitmapDownload.html\n\tFunRunApp/javadoc/xanthanov/droid/xantools/DroidDialogs.html\n\tFunRunApp/javadoc/xanthanov/droid/xantools/DroidLayout.html\n\tFunRunApp/javadoc/xanthanov/droid/xantools/DroidLoc.html\n\tFunRunApp/javadoc/xanthanov/droid/xantools/DroidTTS.html\n\tFunRunApp/javadoc/xanthanov/droid/xantools/DroidUnits.html\n\tFunRunApp/javadoc/xanthanov/droid/xantools/ProgressRunnable.html\n\tFunRunApp/javadoc/xanthanov/droid/xantools/package-frame.html\n\tFunRunApp/javadoc/xanthanov/droid/xantools/package-summary.html\n\tFunRunApp/javadoc/xanthanov/droid/xantools/package-tree.html","Charles Capps"],["0b83e24a4e80ce484f4e8ea8a263ccc46092f213","a4627d56ab001cc9887df100906aceac5f0ebec4@gmail.com","fixed up javadoc","Charles Capps"]],"ref":"refs/heads/master","size":2,"head":"0b83e24a4e80ce484f4e8ea8a263ccc46092f213","push_id":39038274}