140830_01

LoadingDialog added
f02 notice board added
140830_02

손진호 이새끼 깃좀 써라
140830_03

디자인 바꿈
140830_03

ㅎ
140830_04
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
140830_05
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
Merge remote-tracking branch 'origin/gunbaek'

Conflicts:
	LastActivity/AndroidManifest.xml~HEAD
	LastActivity/AndroidManifest.xml~Ver1.0
	LastActivity/project.properties~Ver1.0
	LastActivity/res/layout/webs_free_board.xml~HEAD
	LastActivity/res/layout/webs_free_board_notice_list_item.xml~HEAD
	LastActivity/res/layout/webs_schedule_today_list_item.xml~HEAD
	LastActivity/res/menu/main_menu.xml~HEAD
	LastActivity/res/values-w820dp/dimens.xml~HEAD
	LastActivity/res/values/strings.xml~HEAD
	LastActivity/res/values/styles.xml~HEAD
	LastActivity/src/com/example/lastactivity/WEBS_BOARD_FREE_BOARD.java~HEAD
	LastActivity/src/com/example/lastactivity/WEBS_SCHEDULE_TODAY.java
	WEBS/AndroidManifest.xml
	WEBS/bin/AndroidManifest.xml
	WEBS/bin/R.txt
	WEBS/bin/WEBS.apk
	WEBS/bin/classes.dex
	WEBS/bin/classes/com/webs/app/R$dimen.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/resources.ap_
	WEBS/gen/com/webs/app/R.java
	WEBS/res/layout/act01_join_us.xml
	WEBS/src/app/webs/activity/Act01_JoinUs.java
	WEBS/src/app/webs/activity/StaticVar.java
	WEBS/src/app/webs/service/PushService.java
	lib-project/AndroidBootstrap/bin/androidbootstrap.jar
	lib-project/actionbarsherlock/bin/actionbarsherlock.jar
	lib-project/slidingmenu/bin/library.jar