screw this commit
git commit google stuff
something blah
delete everything
kisuk version of working tab switching
kisuk ver of working tab switching
working database saving
working choose from library option and supporting dialog
about to merge db & cell restructure
compat version
compat ver
compat ver
compat ver
sdfsfdsfd
git commit sex
hello
Merge branch 'master' of https://github.com/dokwon/mingle-android-client

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/e4/81/96/72/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1000389100.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/14.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/15.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/16.png
	mingle-android-client-master/google-play-services_lib/bin/google-play-services_lib.jar
	mingle-android-client-master/mingle/bin/classes.dex
	mingle-android-client-master/mingle/bin/dexedLibs/swipelistview-12072adfeb8f753b47ff0d04110d0d53.jar
	mingle-android-client-master/mingle/bin/mingle.apk
	mingle-android-client-master/mingle/src/com/example/mingle/AllChatFragment.java
	mingle-android-client-master/mingle/src/com/example/mingle/HttpHelper.java
	mingle-android-client-master/mingle/src/com/example/mingle/MainActivity.java
	mingle-android-client-master/swipelistview/bin/swipelistview.jar
fuck
Revert "working choose from library option and supporting dialog"

This reverts commit 9d8aa80e67544c27c1d10e433969c4c3efce6468.

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1000389100.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	mingle-android-client-master/mingle/src/com/example/mingle/MainActivity.java
dddd
Merge branch 'master' of https://github.com/dokwon/mingle-android-client

Conflicts:
	mingle-android-client-master/google-play-services_lib/bin/google-play-services_lib.jar
	mingle-android-client-master/mingle/bin/classes.dex
	mingle-android-client-master/mingle/bin/mingle.apk
	mingle-android-client-master/swipelistview/.classpath
	mingle-android-client-master/swipelistview/bin/swipelistview.jar