i put couchbase lite library and this is compatiable with couchdb
commit before fetching
Merge branch 'master' of https://github.com/LifeLogTLeaf/LifeLogCollector

Conflicts:
	project.properties
	src/com/tleaf/lifelog/activity/MainActivity.java

conflict solved
modified .gitignore to ignore *.properties, .*
commit changes on MainActicity and CouchDBConnector
commit after dinner
201408182143 subin commit changes
201408191446 made markers on Google Map
android
add yoon
i edit someting
AndroidManifest.xml : added Google Map metadata and OpenGl settings
styles.xml : added NoTitleBar Theme
Before Pushing into origin/master
preventing local files being overwritten
fetch and merge , conflict solved
"this is my branch"
jangyoungjin
Merge branch 'young'

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	src/com/tleaf/lifelog/activity/BookmarkShareActivity.java
	src/com/tleaf/lifelog/fragment/BookMarkFragment.java
	src/com/tleaf/lifelog/model/Lifelog.java
	src/com/tleaf/lifelog/model/Location.java
	src/com/tleaf/lifelog/model/UserInfor.java
	src/com/tleaf/lifelog/network/CouchDBLiteTask.java
	src/com/tleaf/lifelog/network/CouchDBTask.java
	src/com/tleaf/lifelog/network/DatabaseConnector.java
merge finished
last merged