trash
trash
s
tras
rr
trash
trash
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$string.class
tasksactivity add proof message for undone all tasks
trasg
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/TasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ToursActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/BaseDialog.class
	TourPilot/bin/dexedLibs/android-support-v4-1911576849660653e459537ca11a7964.jar
	TourPilot/bin/res/crunch/drawable-hdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-hdpi/ic_action_cancel.png
	TourPilot/bin/res/crunch/drawable-mdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-mdpi/ic_action_cancel.png
	TourPilot/bin/res/crunch/drawable-xhdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-xhdpi/ic_action_cancel.png
	TourPilot/bin/res/crunch/drawable-xxhdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-xxhdpi/ic_action_cancel.png
	TourPilot/bin/resources.ap_
	TourPilot/src/isebase/cognito/tourpilot/Activity/TasksActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Dialogs/BaseDialog.java
trash
trash
trash
tra
Delete WorkTypeDialog$1.class
Delete WorkTypeDialog$2.class
Delete WorkStopDialog$1.class
Delete WorkStopDialog.class
1