140830_03

ㅎ
140830_04
Merge remote-tracking branch 'origin/gunbaek' into Ver1.0

Conflicts:
	.gitignore
	WEBS/bin/R.txt
	WEBS/bin/WEBS.apk
	WEBS/bin/classes.dex
	WEBS/bin/classes/app/webs/activity/StaticVar.class
	WEBS/bin/classes/app/webs/service/PushService.class
	WEBS/bin/classes/app/webs/service/ServiceRestart.class
	WEBS/bin/classes/com/webs/app/R$drawable.class
	WEBS/bin/classes/com/webs/app/R$id.class
	WEBS/bin/classes/com/webs/app/R$layout.class
	WEBS/bin/classes/com/webs/app/R$menu.class
	WEBS/bin/classes/com/webs/app/R$string.class
	WEBS/bin/classes/com/webs/app/R$style.class
	WEBS/bin/res/drawable-hdpi/box_down.9.png
	WEBS/bin/res/drawable-hdpi/box_up.9.png
	WEBS/bin/resources.ap_
	WEBS/gen/com/webs/app/R.java
'ldf'sda
Merge remote-tracking branch 'origin/gunbaek' into Ver1.0

Conflicts:
	.gitignore
	WEBS/bin/WEBS.apk
	WEBS/bin/resources.ap_
	lib-project/AndroidBootstrap/bin/androidbootstrap.jar
	lib-project/actionbarsherlock/bin/actionbarsherlock.jar
	lib-project/slidingmenu/bin/library.jar
Ver1.0 Semi-complete
Ver1.0 Semi--complete
Ver1.2

add comment