Pis R fil
Knap i PictoAdmin som sender tomme objekter implementeret
Merge remote-tracking branch 'origin/master' into Anders
Merge branch 'master' of https://github.com/WhyNotZoidberg/SW6Parrot into Sprint1
continues Intergration files
continues Intergration (pictoAdmin)
Close on icon
Merge remote-tracking branch 'origin/master' into Anders

Conflicts:
	Source/workspace/PictoAdmin/gen/dk/aau/cs/giraf/pictoadmin/R.java
	Source/workspace/PictoAdmin/res/layout/activity_picto_admin_main.xml
	Source/workspace/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/PictoAdminMain.java
oh  shit
oh balls
	deleted:    source/workspace/AmbilWarna/.classpath
	deleted:    source/workspace/AmbilWarna/.project
	deleted:    source/workspace/AmbilWarna/AndroidManifest.xml
	deleted:    source/workspace/AmbilWarna/gen/yuku/ambilwarna/BuildConfig.java
	deleted:    source/workspace/AmbilWarna/gen/yuku/ambilwarna/R.java
	deleted:    source/workspace/AmbilWarna/res/drawable-hdpi/ambilwarna_arrow_down.png
deleted:    source/workspace/AmbilWarna/res/drawable-hdpi/ambilwarna_arrow_right.png
	deleted:    source/workspace/AmbilWarna/res/drawable-hdpi/ambilwarna_target.png
	deleted:    source/workspace/AmbilWarna/res/drawable-ldpi/ambilwarna_arrow_down.png
	deleted:    source/workspace/AmbilWarna/res/drawable-ldpi/ambilwarna_arrow_right.png
	deleted:    source/workspace/AmbilWarna/res/drawable-ldpi/ambilwarna_cursor.png
	deleted:    source/workspace/AmbilWarna/res/drawable-ldpi/ambilwarna_target.png
	deleted:    source/workspace/AmbilWarna/res/drawable-xhdpi/ambilwarna_arrow_down.png
	deleted:    source/workspace/AmbilWarna/res/drawable-xhdpi/ambilwarna_arrow_right.png
	deleted:    source/workspace/AmbilWarna/res/drawable-xhdpi/ambilwarna_cursor.png
	deleted:    source/workspace/AmbilWarna/res/drawable-xhdpi/ambilwarna_target.png
	deleted:    source/workspace/AmbilWarna/res/drawable/ambilwarna_arrow_down.png
	deleted:    source/workspace/AmbilWarna/res/drawable/ambilwarna_arrow_right.png
	deleted:    source/workspace/AmbilWarna/res/drawable/ambilwarna_cursor.png
	deleted:    source/workspace/AmbilWarna/res/drawable/ambilwarna_hue.png
	deleted:    source/workspace/AmbilWarna/res/drawable/ambilwarna_target.png
	deleted:    source/workspace/AmbilWarna/res/layout/ambilwarna_dialog.xml
	deleted:    source/workspace/AmbilWarna/res/values-land/dimen.xml
	deleted:    source/workspace/AmbilWarna/res/values-xlarge-land/dimen.xml
	deleted:    source/workspace/AmbilWarna/res/values/dimen.xml
	deleted:    source/workspace/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaDialog.java
	deleted:    source/workspace/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaKotak.java
	deleted:    source/workspace/DrawLib/.classpath
	deleted:    source/workspace/DrawLib/.project
	deleted:    source/workspace/DrawLib/AndroidManifest.xml
	deleted:    source/workspace/DrawLib/gen/dk/aau/cs/giraf/wombat/drawlib/BuildConfig.java
	deleted:    source/workspace/DrawLib/gen/dk/aau/cs/giraf/wombat/drawlib/R.java
	deleted:    source/workspace/DrawLib/proguard-project.txt
	deleted:    source/workspace/DrawLib/project.properties
	deleted:    source/workspace/DrawLib/res/drawable-ldpi/ic_launcher.png
	deleted:    source/workspace/DrawLib/res/drawable-mdpi/ic_launcher.png
	deleted:    source/workspace/DrawLib/res/drawable-xhdpi/ic_launcher.png
	deleted:    source/workspace/DrawLib/res/layout/main.xml
	deleted:    source/workspace/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DoneScreenActivity.java
	deleted:    source/workspace/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DrawDigital.java
	deleted:    source/workspace/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DrawHourglass.java
	deleted:    source/workspace/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DrawLibActivity.java
	deleted:    source/workspace/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DrawProgressBar.java
	deleted:    source/workspace/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DrawWatch.java
	deleted:    source/workspace/GIRAF_Components/.project
	deleted:    source/workspace/GIRAF_Components/AndroidManifest.xml
	deleted:    source/workspace/GIRAF_Components/gen/dk/aau/cs/giraf/gui/BuildConfig.java
	deleted:    source/workspace/GIRAF_Components/gen/dk/aau/cs/giraf/gui/R.java
	deleted:    source/workspace/GIRAF_Components/lint.xml
	deleted:    source/workspace/GIRAF_Components/proguard-project.txt
	deleted:    source/workspace/GIRAF_Components/project.properties
deleted:    source/workspace/GIRAF_Components/res/drawable-hdpi/ic_launcher.png
	deleted:    source/workspace/GIRAF_Components/res/drawable-ldpi/ic_launcher.png
	deleted:    source/workspace/GIRAF_Components/res/drawable-mdpi/ic_launcher.png
	deleted:    source/workspace/GIRAF_Components/res/drawable-xhdpi/ic_launcher.png
	deleted:    source/workspace/GIRAF_Components/res/drawable/cancel_icon.png
	deleted:    source/workspace/GIRAF_Components/res/drawable/colorborder.xml
	deleted:    source/workspace/GIRAF_Components/res/drawable/gbackgroundlight.xml
	deleted:    source/workspace/GIRAF_Components/res/drawable/gbutton.xml
	deleted:    source/workspace/GIRAF_Components/res/drawable/gcal_icon.png
	deleted:    source/workspace/GIRAF_Components/res/drawable/gdialog_background.xml
	deleted:    source/workspace/GIRAF_Components/res/drawable/ggiraficon_offline.png
	deleted:    source/workspace/GIRAF_Components/res/drawable/ggiraficon_online.png
	deleted:    source/workspace/GIRAF_Components/res/drawable/glistitem.xml
	deleted:    source/workspace/GIRAF_Components/res/drawable/glogout_icon.png
	deleted:    source/workspace/GIRAF_Components/res/drawable/gprofile_pic_box.xml
	deleted:    source/workspace/GIRAF_Components/res/drawable/grow.xml
	deleted:    source/workspace/GIRAF_Components/res/drawable/gtooltip.xml
	deleted:    source/workspace/GIRAF_Components/res/drawable/gtooltip_arrow.png
deleted:    source/workspace/GIRAF_Components/res/drawable/no_profile_pic.png
	deleted:    source/workspace/GIRAF_Components/res/layout/gdialog_layout.xml
	deleted:    source/workspace/GIRAF_Components/res/layout/gprofile_row.xml
	deleted:    source/workspace/GIRAF_Components/res/layout/gtooltip_layout.xml
	deleted:    source/workspace/GIRAF_Components/res/values/strings.xml
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/GButton.java
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/GCancelButton.java
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/GDialog.java
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/GIconButton.java
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/GList.java
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/GProfileAdapter.java
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/GVerifyButton.java
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/GWidgetCalendar.java
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/GWidgetConnectivity.java
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/GWidgetLogout.java
	deleted:    source/workspace/GIRAF_Components/src/dk/aau/cs/giraf/gui/IGWidget.java
	deleted:    source/workspace/Launcher/.classpath
	deleted:    source/workspace/Launcher/AndroidManifest.xml
	deleted:    source/workspace/Launcher/assets/OasisLib_dev.jar
deleted:    source/workspace/Launcher/assets/OasisLib_dev_AuthTest.jar
	deleted:    source/workspace/Launcher/assets/robotium-solo-3.2.1.jar
	deleted:    source/workspace/Launcher/gen/com/google/zxing/client/android/R.java
	deleted:    source/workspace/Launcher/gen/dk/aau/cs/giraf/gui/R.java
	deleted:    source/workspace/Launcher/gen/dk/aau/cs/giraf/launcher/BuildConfig.java
	deleted:    source/workspace/Launcher/gen/dk/aau/cs/giraf/launcher/R.java
	deleted:    source/workspace/Launcher/lint.xml
	deleted:    source/workspace/Launcher/proguard-project.txt
	deleted:    source/workspace/Launcher/project.properties
deleted:    source/workspace/Launcher/res/animator/instruct_ani.xml
	deleted:    source/workspace/Launcher/res/drawable-hdpi/app_icon.png
	deleted:    source/workspace/Launcher/res/drawable-hdpi/icon_giraf.png
	deleted:    source/workspace/Launcher/res/drawable-ldpi/app_icon.png
	deleted:    source/workspace/Launcher/res/drawable-mdpi/app_icon.png
	deleted:    source/workspace/Launcher/res/drawable-xhdpi/app_icon.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00000.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00002.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00004.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00005.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00006.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00007.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00008.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00011.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00013.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00014.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00016.png
deleted:    source/workspace/Launcher/res/drawable/ani_00017.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00019.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00020.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00021.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00022.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00023.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00024.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00025.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00026.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00027.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00028.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00030.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00031.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00032.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00033.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00035.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00036.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00037.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00038.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00039.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00040.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00041.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00043.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00045.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00046.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00047.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00049.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00050.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00051.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00052.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00053.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00054.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00056.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00057.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00058.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00060.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00061.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00063.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00064.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00065.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00066.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00068.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00070.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00072.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00080.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00081.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00082.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00083.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00085.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00086.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00087.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00088.png
	deleted:    source/workspace/Launcher/res/drawable/ani_00089.png
	deleted:    source/workspace/Launcher/res/drawable/appborder.xml
	deleted:    source/workspace/Launcher/res/drawable/drawerbackground.xml
	deleted:    source/workspace/Launcher/res/drawable/homebar_back_land.9.png
	deleted:    source/workspace/Launcher/res/drawable/homebar_back_port.9.png
	deleted:    source/workspace/Launcher/res/drawable/large_switch_profile.png
	deleted:    source/workspace/Launcher/res/layout/apps.xml
	deleted:    source/workspace/Launcher/res/layout/home.xml
	deleted:    source/workspace/Launcher/res/layout/logo.xml
	deleted:    source/workspace/Launcher/res/layout/profileselect.xml
	deleted:    source/workspace/Launcher/res/values/strings.xml
	deleted:    source/workspace/Launcher/src/dk/aau/cs/giraf/launcher/AppAdapter.java
	deleted:    source/workspace/Launcher/src/dk/aau/cs/giraf/launcher/AuthenticationActivity.java
	deleted:    source/workspace/Launcher/src/dk/aau/cs/giraf/launcher/Data.java
	deleted:    source/workspace/Launcher/src/dk/aau/cs/giraf/launcher/GAppDragger.java
	deleted:    source/workspace/Launcher/src/dk/aau/cs/giraf/launcher/HomeActivity.java
	deleted:    source/workspace/Launcher/src/dk/aau/cs/giraf/launcher/LogoActivity.java
	deleted:    source/workspace/Launcher/src/dk/aau/cs/giraf/launcher/ProfileLauncher.java
	deleted:    source/workspace/Launcher/src/dk/aau/cs/giraf/launcher/Tools.java
	deleted:    source/workspace/Launcher/srcTest/dk/aau/cs/giraf/launcher/test/ToolsTest.java
	deleted:    source/workspace/LocalDB/.classpath
	deleted:    source/workspace/LocalDB/.project
	deleted:    source/workspace/LocalDB/AndroidManifest.xml
	deleted:    source/workspace/LocalDB/gen/dk/aau/cs/giraf/oasis/localdb/BuildConfig.java
	deleted:    source/workspace/LocalDB/proguard.cfg
	deleted:    source/workspace/LocalDB/project.properties
	deleted:    source/workspace/LocalDB/res/drawable-hdpi/ic_launcher.png
	deleted:    source/workspace/LocalDB/res/drawable-ldpi/ic_launcher.png
	deleted:    source/workspace/LocalDB/res/layout/main.xml
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/AppsMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/AppsTable.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/AuthUsersMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/DbHelper.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/DbProvider.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/DepartmentsMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasDepartmentMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasDepartmentTable.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasGuardianMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasGuardianTable.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasLinkMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasSubDepartmentMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasSubDepartmentTable.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasTagMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasTagTable.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/ListOfAppsMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaDepartmentAccessMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaDepartmentAccessTable.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaProfileAccessMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaProfileAccessTable.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaTable.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/ProfilesTable.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/TagsMetaData.java
	deleted:    source/workspace/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/TagsTable.java
	deleted:    source/workspace/OasisApp/.classpath
	deleted:    source/workspace/OasisApp/.project
	deleted:    source/workspace/OasisApp/assets/OasisLib_dev.jar
	deleted:    source/workspace/OasisApp/proguard.cfg
	deleted:    source/workspace/OasisApp/project.properties
	deleted:    source/workspace/OasisApp/res/drawable-hdpi/ic_launcher.png
	deleted:    source/workspace/OasisApp/res/drawable-hdpi/logo.png
	deleted:    source/workspace/OasisApp/res/drawable-ldpi/ic_launcher.png
	deleted:    source/workspace/OasisApp/res/drawable-mdpi/ic_launcher.png
	deleted:    source/workspace/OasisApp/res/drawable/tab_focused.xml
	deleted:    source/workspace/OasisApp/res/drawable/tab_pressed.xml
	deleted:    source/workspace/OasisApp/res/drawable/tab_selected.xml
deleted:    source/workspace/OasisApp/res/drawable/tab_selector.xml
	deleted:    source/workspace/OasisApp/res/drawable/tab_text_selector.xml
	deleted:    source/workspace/OasisApp/res/drawable/tab_unselected.xml
	deleted:    source/workspace/OasisApp/res/layout/apps_list_item.xml
	deleted:    source/workspace/OasisApp/res/layout/apps_view.xml
	deleted:    source/workspace/OasisApp/res/layout/children_list_childitem.xml
	deleted:    source/workspace/OasisApp/res/layout/children_list_groupitem.xml
	deleted:    source/workspace/OasisApp/res/layout/children_view.xml
	deleted:    source/workspace/OasisApp/res/layout/createdepartment_view.xml
	deleted:    source/workspace/OasisApp/res/layout/createprofile_view.xml
	deleted:    source/workspace/OasisApp/res/layout/department_list_item.xml
	deleted:    source/workspace/OasisApp/res/layout/departments_view.xml
	deleted:    source/workspace/OasisApp/res/layout/fourtabsview.xml
	deleted:    source/workspace/OasisApp/res/layout/fragments_view.xml
	deleted:    source/workspace/OasisApp/res/layout/main.xml
	deleted:    source/workspace/OasisApp/res/layout/media_list_item.xml
	deleted:    source/workspace/OasisApp/res/layout/media_view.xml
	deleted:    source/workspace/OasisApp/res/layout/menulist_fragment_view.xml
	deleted:    source/workspace/OasisApp/res/layout/modifyprofile_view.xml
 	deleted:    source/workspace/OasisApp/res/layout/myprofile_view.xml
	deleted:    source/workspace/OasisApp/res/layout/onetabsview.xml
  	deleted:    source/workspace/OasisApp/res/layout/profilepopup_view.xml
	deleted:    source/workspace/OasisApp/res/layout/tab.xml
 	deleted:    source/workspace/OasisApp/res/layout/threetabsview.xml
	deleted:    source/workspace/OasisApp/res/layout/twotabsview.xml
	deleted:    source/workspace/PictoAdmin/.classpath
	deleted:    source/workspace/PictoAdmin/AndroidManifest.xml
	deleted:    source/workspace/PictoAdmin/build.xml
	deleted:    source/workspace/PictoAdmin/gen/dk/aau/cs/giraf/oasis/lib/R.java
	deleted:    source/workspace/PictoAdmin/gen/dk/aau/cs/giraf/pictoadmin/BuildConfig.java
	deleted:    source/workspace/PictoAdmin/gen/dk/aau/cs/giraf/pictoadmin/R.java
	deleted:    source/workspace/PictoAdmin/ic_launcher-web.png
	deleted:    source/workspace/PictoAdmin/libs/android-support-v4.jar
	deleted:    source/workspace/PictoAdmin/lint.xml
	deleted:    source/workspace/PictoAdmin/proguard-project.txt
	deleted:    source/workspace/PictoAdmin/project.properties
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/action_about.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/action_help.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/collections_collection.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/content_discard.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/content_new_picture.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/content_save.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/device_access_camera.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/ic_action_search.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/ic_launcher.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/navigation_accept.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/navigation_back.png
	deleted:    source/workspace/PictoAdmin/res/drawable-hdpi/navigation_cancel.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/action_about.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/action_help.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/collections_view_as_list.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/content_discard.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/content_new_picture.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/content_save.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/device_access_camera.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/ic_action_search.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/ic_launcher.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/navigation_accept.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/navigation_back.png
	deleted:    source/workspace/PictoAdmin/res/drawable-mdpi/navigation_cancel.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/action_about.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/action_help.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/collections_view_as_list.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/content_discard.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/content_new_picture.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/content_save.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/device_access_camera.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/ic_action_search.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/ic_launcher.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/navigation_accept.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/navigation_back.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xhdpi/navigation_cancel.png
	deleted:    source/workspace/PictoAdmin/res/drawable-xxhdpi/ic_launcher.png
	deleted:    source/workspace/PictoAdmin/res/layout/activity_admin_category.xml
	deleted:    source/workspace/PictoAdmin/res/layout/activity_help_menu.xml
	deleted:    source/workspace/PictoAdmin/res/layout/activity_picto_admin_main.xml
	deleted:    source/workspace/PictoAdmin/res/menu/activity_admin_category.xml
	deleted:    source/workspace/PictoAdmin/res/menu/activity_help_menu.xml
	deleted:    source/workspace/PictoAdmin/res/menu/picto_admin_main.xml
	deleted:    source/workspace/PictoAdmin/res/values-sw600dp/dimens.xml
	deleted:    source/workspace/PictoAdmin/res/values-sw720dp-land/dimens.xml
	deleted:    source/workspace/PictoAdmin/res/values-v11/styles.xml
	deleted:    source/workspace/PictoAdmin/res/values/dimens.xml
	deleted:    source/workspace/PictoAdmin/res/values/strings.xml
	deleted:    source/workspace/PictoAdmin/res/values/styles.xml
	deleted:    source/workspace/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/AdminCategory.java
	deleted:    source/workspace/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/DatabaseHandler.java
	deleted:    source/workspace/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/HelpMenu.java
	deleted:    source/workspace/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/PictoAdminMain.java
	deleted:    source/workspace/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/PlaceHolder.java
	deleted:    source/workspace/TimerLib/.classpath
	deleted:    source/workspace/TimerLib/.project
	deleted:    source/workspace/TimerLib/AndroidManifest.xml
	deleted:    source/workspace/TimerLib/gen/dk/aau/cs/giraf/TimerLib/BuildConfig.java
	deleted:    source/workspace/TimerLib/proguard.cfg
	deleted:    source/workspace/TimerLib/project.properties
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/Art.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/Attachment.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/CRUD.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/Child.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/DigitalClock.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/Guardian.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/Hourglass.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/ProgressBar.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/SingleImg.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/SplitImg.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/SubProfile.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/TimeTimer.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/Timer.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/TimerHelper.java
	deleted:    source/workspace/TimerLib/src/dk/aau/cs/giraf/TimerLib/formFactor.java
	deleted:    source/workspace/Wombat/.classpath
	deleted:    source/workspace/Wombat/.project
	deleted:    source/workspace/Wombat/AndroidManifest.xml
	deleted:    source/workspace/Wombat/libs/OasisLib_dev.jar
	deleted:    source/workspace/Wombat/proguard-project.txt
	deleted:    source/workspace/Wombat/project.properties
	deleted:    source/workspace/Wombat/res/drawable-hdpi/checkmark.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/default_profile.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/ic_launcher.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/last_used.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/p_done.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/p_gaa_til_skema.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/p_gaa_til_taxa.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/p_ryd_op.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/predef.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_attachment.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_digital.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_dual_pic.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_hourglass.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_progressbar.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_save.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_save_gray.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_saveas.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_saveas_gray.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_single_pic.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_start.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_start_gray.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/thumbnail_timetimer.png
	deleted:    source/workspace/Wombat/res/drawable-hdpi/wombat_icon.png
	deleted:    source/workspace/Wombat/res/drawable/attachment_background.xml
	deleted:    source/workspace/Wombat/res/drawable/attachment_layer.xml
	deleted:    source/workspace/Wombat/res/drawable/background.xml
	deleted:    source/workspace/Wombat/res/drawable/btn.xml
	deleted:    source/workspace/Wombat/res/drawable/btn_normal.xml
	deleted:    source/workspace/Wombat/res/drawable/btn_pressed.xml
	deleted:    source/workspace/Wombat/res/drawable/checkbox.xml
	deleted:    source/workspace/Wombat/res/drawable/color_btn.xml
	deleted:    source/workspace/Wombat/res/drawable/color_btn_normal.xml
	deleted:    source/workspace/Wombat/res/drawable/list.xml
	deleted:    source/workspace/Wombat/res/drawable/list_normal.xml
	deleted:    source/workspace/Wombat/res/drawable/list_pressed.xml
	deleted:    source/workspace/Wombat/res/drawable/list_selected.xml
	deleted:    source/workspace/Wombat/res/drawable/timer_button.xml
	deleted:    source/workspace/Wombat/res/drawable/wdialog_background.xml
	deleted:    source/workspace/Wombat/res/layout/customize.xml
	deleted:    source/workspace/Wombat/res/layout/details.xml
	deleted:    source/workspace/Wombat/res/layout/main.xml
	deleted:    source/workspace/Wombat/res/layout/profile_list.xml
	deleted:    source/workspace/Wombat/res/layout/profile_list_dialog.xml
	deleted:    source/workspace/Wombat/res/layout/profile_list_item.xml
	deleted:    source/workspace/Wombat/res/layout/subprofile_list.xml
	deleted:    source/workspace/Wombat/res/layout/subprofile_list_item.xml
	deleted:    source/workspace/Wombat/res/layout/wdialog.xml
	deleted:    source/workspace/Wombat/res/values/profiles.xml
	deleted:    source/workspace/Wombat/res/values/strings.xml
	deleted:    source/workspace/Wombat/res/values/wombat_style.xml
	deleted:    source/workspace/Wombat/src/dk/aau/cs/giraf/wombat/ArtAdapter.java
	deleted:    source/workspace/Wombat/src/dk/aau/cs/giraf/wombat/ChildAdapter.java
	deleted:    source/workspace/Wombat/src/dk/aau/cs/giraf/wombat/ChildFragment.java
	deleted:    source/workspace/Wombat/src/dk/aau/cs/giraf/wombat/CustomizeFragment.java
	deleted:    source/workspace/Wombat/src/dk/aau/cs/giraf/wombat/MainActivity.java
	deleted:    source/workspace/Wombat/src/dk/aau/cs/giraf/wombat/ModeAdapter.java
	deleted:    source/workspace/Wombat/src/dk/aau/cs/giraf/wombat/SubProfileAdapter.java
	deleted:    source/workspace/Wombat/src/dk/aau/cs/giraf/wombat/SubProfileFragment.java
	deleted:    source/workspace/Wombat/src/dk/aau/cs/giraf/wombat/WCheckbox.java
	deleted:    source/workspace/Wombat/src/dk/aau/cs/giraf/wombat/WDialog.java
	deleted:    source/workspace/android/.classpath
	deleted:    source/workspace/android/.project
	deleted:    source/workspace/android/AndroidManifest.xml
	deleted:    source/workspace/android/ant.properties
	deleted:    source/workspace/android/assets/html-en/about1d.html
	deleted:    source/workspace/android/assets/html-en/about2d.html
	deleted:    source/workspace/android/assets/html-en/index.html
	deleted:    source/workspace/android/assets/html-en/scanning.html
	deleted:    source/workspace/android/assets/html-en/sharing.html
	deleted:    source/workspace/android/assets/html-en/whatsnew.html
	deleted:    source/workspace/android/assets/images/big-1d.png
	deleted:    source/workspace/android/assets/images/big-datamatrix.png
	deleted:    source/workspace/android/assets/images/big-qr.png
	deleted:    source/workspace/android/assets/images/contact-results-screen.jpg
	deleted:    source/workspace/android/assets/images/demo-no.png
	deleted:    source/workspace/android/assets/images/demo-yes.png
	deleted:    source/workspace/android/assets/images/scan-example.png
	deleted:    source/workspace/android/assets/images/scan-from-phone.png
	deleted:    source/workspace/android/assets/images/search-book-contents.jpg
	deleted:    source/workspace/android/assets/style.css
	deleted:    source/workspace/android/build.xml
	deleted:    source/workspace/android/gen/com/google/zxing/client/android/BuildConfig.java
	deleted:    source/workspace/android/gen/com/google/zxing/client/android/R.java
	deleted:    source/workspace/android/libs/core.jar
	deleted:    source/workspace/android/proguard.cfg
	deleted:    source/workspace/android/project.properties
	deleted:    source/workspace/android/res/drawable-hdpi/launcher_icon.png
	deleted:    source/workspace/android/res/drawable-hdpi/shopper_icon.png
	deleted:    source/workspace/android/res/drawable/launcher_icon.png
	deleted:    source/workspace/android/res/drawable/share_via_barcode.png
	deleted:    source/workspace/android/res/drawable/shopper_icon.png
	deleted:    source/workspace/android/res/layout-land/encode.xml
	deleted:    source/workspace/android/res/layout-land/share.xml
	deleted:    source/workspace/android/res/layout-ldpi/capture.xml
	deleted:    source/workspace/android/res/layout/bookmark_picker_list_item.xml
	deleted:    source/workspace/android/res/layout/capture.xml
	deleted:    source/workspace/android/res/layout/encode.xml
	deleted:    source/workspace/android/res/layout/help.xml
	deleted:    source/workspace/android/res/layout/history_list_item.xml
	deleted:    source/workspace/android/res/layout/search_book_contents.xml
	deleted:    source/workspace/android/res/layout/search_book_contents_header.xml
	deleted:    source/workspace/android/res/layout/search_book_contents_list_item.xml
	deleted:    source/workspace/android/res/layout/share.xml
	deleted:    source/workspace/android/res/raw/beep.ogg
	deleted:    source/workspace/android/res/values-ar/strings.xml
	deleted:    source/workspace/android/res/values-bg/strings.xml
	deleted:    source/workspace/android/res/values-ca/strings.xml
	deleted:    source/workspace/android/res/values-cs/strings.xml
	deleted:    source/workspace/android/res/values-da/strings.xml
	deleted:    source/workspace/android/res/values-de/strings.xml
	deleted:    source/workspace/android/res/values-el/strings.xml
	deleted:    source/workspace/android/res/values-es/strings.xml
	deleted:    source/workspace/android/res/values-eu/strings.xml
	deleted:    source/workspace/android/res/values-fi/strings.xml
	deleted:    source/workspace/android/res/values-fr/strings.xml
	deleted:    source/workspace/android/res/values-he/strings.xml
	deleted:    source/workspace/android/res/values-hi/strings.xml
	deleted:    source/workspace/android/res/values-hu/strings.xml
	deleted:    source/workspace/android/res/values-id/strings.xml
	deleted:    source/workspace/android/res/values-it/strings.xml
	deleted:    source/workspace/android/res/values-iw/strings.xml
	deleted:    source/workspace/android/res/values-ja/strings.xml
	deleted:    source/workspace/android/res/values-ko/strings.xml
	deleted:    source/workspace/android/res/values-nl/strings.xml
	deleted:    source/workspace/android/res/values-pl/strings.xml
	deleted:    source/workspace/android/res/values-pt/strings.xml
	deleted:    source/workspace/android/res/values-ru/strings.xml
	deleted:    source/workspace/android/res/values-sk/strings.xml
	deleted:    source/workspace/android/res/values-sl/strings.xml
	deleted:    source/workspace/android/res/values-sv/strings.xml
	deleted:    source/workspace/android/res/values-tr/strings.xml
	deleted:    source/workspace/android/res/values-zh-rCN/strings.xml
	deleted:    source/workspace/android/res/values-zh-rTW/strings.xml
	deleted:    source/workspace/android/res/values/arrays.xml
	deleted:    source/workspace/android/res/values/colors.xml
	deleted:    source/workspace/android/res/values/ids.xml
	deleted:    source/workspace/android/res/values/strings.xml
	deleted:    source/workspace/android/res/xml/preferences.xml
	deleted:    source/workspace/android/src/com/google/zxing/client/android/BeepManager.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/CaptureActivity.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/Contents.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/DecodeFormatManager.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/DecodeHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/DecodeThread.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/FinishListener.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/HelpActivity.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/HttpHelper.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/InactivityTimer.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/IntentSource.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/Intents.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/LocaleManager.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/PlanarYUVLuminanceSource.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/PreferencesActivity.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/ViewfinderResultPointCallback.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/ViewfinderView.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/book/BrowseBookListener.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/book/NetworkWorker.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/book/SearchBookContentsAdapter.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/book/SearchBookContentsResult.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/camera/CameraManager.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/camera/PreviewCallback.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/encode/ContactEncoder.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/encode/EncodeActivity.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/encode/Formatter.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/encode/MECARDContactEncoder.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/encode/VCardContactEncoder.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/history/DBHelper.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/history/HistoryActivity.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/history/HistoryItem.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/history/HistoryItemAdapter.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/history/HistoryManager.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/CalendarResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/EmailAddressResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/GeoResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/ISBNResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/ProductResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/ResultButtonListener.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/ResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/ResultHandlerFactory.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/SMSResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/TelResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/TextResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/URIResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/WifiResultHandler.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/supplement/KillerCallable.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/supplement/ProductResultInfoRetriever.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/share/AppPickerActivity.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/share/BookmarkAdapter.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/share/BookmarkPickerActivity.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/share/LoadPackagesAsyncTask.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/share/ShareActivity.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/wifi/NetworkType.java
	deleted:    source/workspace/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java
	deleted:    source/workspace/wheel/.classpath
	deleted:    source/workspace/wheel/.project
	deleted:    source/workspace/wheel/AndroidManifest.xml
	deleted:    source/workspace/wheel/gen/kankan/wheel/BuildConfig.java
	deleted:    source/workspace/wheel/gen/kankan/wheel/R.java
	deleted:    source/workspace/wheel/project.properties
	deleted:    source/workspace/wheel/res/drawable/wheel_bg.xml
	deleted:    source/workspace/wheel/res/drawable/wheel_val.xml
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/ItemsRange.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/OnWheelChangedListener.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/OnWheelClickedListener.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/OnWheelScrollListener.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/WheelAdapter.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/WheelRecycle.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/WheelScroller.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/WheelView.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/adapters/AbstractWheelAdapter.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/adapters/AbstractWheelTextAdapter.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/adapters/AdapterWheel.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/adapters/ArrayWheelAdapter.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/adapters/NumericWheelAdapter.java
	deleted:    source/workspace/wheel/src/kankan/wheel/widget/adapters/WheelViewAdapter.java
	new file:   source/AmbilWarna/.classpath
	new file:   source/AmbilWarna/.project
	new file:   source/AmbilWarna/AndroidManifest.xml
	new file:   source/AmbilWarna/gen/yuku/ambilwarna/BuildConfig.java
	new file:   source/AmbilWarna/gen/yuku/ambilwarna/R.java
	new file:   source/AmbilWarna/project.properties
	new file:   source/AmbilWarna/res/drawable-hdpi/ambilwarna_arrow_down.png
	new file:   source/AmbilWarna/res/drawable-hdpi/ambilwarna_arrow_right.png
	new file:   source/AmbilWarna/res/drawable-hdpi/ambilwarna_cursor.png
	new file:   source/AmbilWarna/res/drawable-hdpi/ambilwarna_target.png
	new file:   source/AmbilWarna/res/drawable-ldpi/ambilwarna_arrow_down.png
	new file:   source/AmbilWarna/res/drawable-ldpi/ambilwarna_arrow_right.png
	new file:   source/AmbilWarna/res/drawable-ldpi/ambilwarna_cursor.png
	new file:   source/AmbilWarna/res/drawable-ldpi/ambilwarna_target.png
	new file:   source/AmbilWarna/res/drawable-xhdpi/ambilwarna_arrow_down.png
	new file:   source/AmbilWarna/res/drawable-xhdpi/ambilwarna_arrow_right.png
	new file:   source/AmbilWarna/res/drawable-xhdpi/ambilwarna_cursor.png
	new file:   source/AmbilWarna/res/drawable-xhdpi/ambilwarna_target.png
	new file:   source/AmbilWarna/res/drawable/ambilwarna_arrow_down.png
	new file:   source/AmbilWarna/res/drawable/ambilwarna_arrow_right.png
	new file:   source/AmbilWarna/res/drawable/ambilwarna_cursor.png
	new file:   source/AmbilWarna/res/drawable/ambilwarna_hue.png
	new file:   source/AmbilWarna/res/drawable/ambilwarna_target.png
	new file:   source/AmbilWarna/res/layout-land/ambilwarna_dialog.xml
	new file:   source/AmbilWarna/res/layout/ambilwarna_dialog.xml
	new file:   source/AmbilWarna/res/values-land/dimen.xml
	new file:   source/AmbilWarna/res/values-xlarge-land/dimen.xml
	new file:   source/AmbilWarna/res/values/dimen.xml
	new file:   source/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaDialog.java
	new file:   source/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaKotak.java
	new file:   source/DrawLib/.classpath
	new file:   source/DrawLib/.project
	new file:   source/DrawLib/AndroidManifest.xml
	new file:   source/DrawLib/gen/dk/aau/cs/giraf/wombat/drawlib/BuildConfig.java
	new file:   source/DrawLib/gen/dk/aau/cs/giraf/wombat/drawlib/R.java
	new file:   source/DrawLib/proguard-project.txt
	new file:   source/DrawLib/project.properties
	new file:   source/DrawLib/res/drawable-hdpi/ic_launcher.png
	new file:   source/DrawLib/res/drawable-ldpi/ic_launcher.png
	new file:   source/DrawLib/res/drawable-mdpi/ic_launcher.png
	new file:   source/DrawLib/res/drawable-xhdpi/ic_launcher.png
	new file:   source/DrawLib/res/layout/main.xml
	new file:   source/DrawLib/res/values/strings.xml
	new file:   source/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DoneScreenActivity.java
	new file:   source/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DrawDigital.java
	new file:   source/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DrawHourglass.java
	new file:   source/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DrawLibActivity.java
	new file:   source/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DrawProgressBar.java
	new file:   source/DrawLib/src/dk/aau/cs/giraf/wombat/drawlib/DrawWatch.java
	new file:   source/GIRAF_Components/.classpath
	new file:   source/GIRAF_Components/.project
	new file:   source/GIRAF_Components/AndroidManifest.xml
	new file:   source/GIRAF_Components/gen/dk/aau/cs/giraf/gui/BuildConfig.java
	new file:   source/GIRAF_Components/gen/dk/aau/cs/giraf/gui/R.java
	new file:   source/GIRAF_Components/lint.xml
	new file:   source/GIRAF_Components/proguard-project.txt
	new file:   source/GIRAF_Components/project.properties
	new file:   source/GIRAF_Components/res/drawable-hdpi/ic_launcher.png
	new file:   source/GIRAF_Components/res/drawable-hdpi/ok_icon.png
	new file:   source/GIRAF_Components/res/drawable-ldpi/ic_launcher.png
	new file:   source/GIRAF_Components/res/drawable-mdpi/ic_launcher.png
	new file:   source/GIRAF_Components/res/drawable-xhdpi/ic_launcher.png
	new file:   source/GIRAF_Components/res/drawable/cancel_icon.png
	new file:   source/GIRAF_Components/res/drawable/colorborder.xml
	new file:   source/GIRAF_Components/res/drawable/gbackground.xml
	new file:   source/GIRAF_Components/res/drawable/gbackgroundlight.xml
	new file:   source/GIRAF_Components/res/drawable/gbutton.xml
	new file:   source/GIRAF_Components/res/drawable/gcal_icon.png
	new file:   source/GIRAF_Components/res/drawable/gdialog_background.xml
	new file:   source/GIRAF_Components/res/drawable/ggiraficon_offline.png
	new file:   source/GIRAF_Components/res/drawable/ggiraficon_online.png
	new file:   source/GIRAF_Components/res/drawable/ggiraficon_syncing.png
	new file:   source/GIRAF_Components/res/drawable/glistitem.xml
	new file:   source/GIRAF_Components/res/drawable/glogout_icon.png
	new file:   source/GIRAF_Components/res/drawable/gprofile_pic_box.xml
	new file:   source/GIRAF_Components/res/drawable/gprofileselecter_background.xml
	new file:   source/GIRAF_Components/res/drawable/grow.xml
	new file:   source/GIRAF_Components/res/drawable/gtooltip.xml
	new file:   source/GIRAF_Components/res/drawable/gtooltip_arrow.png
	new file:   source/GIRAF_Components/res/drawable/gverifybutton.xml
	new file:   source/GIRAF_Components/res/drawable/no_profile_pic.png
	new file:   source/GIRAF_Components/res/layout/colorpicker.xml
	new file:   source/GIRAF_Components/res/layout/gdialog_layout.xml
	new file:   source/GIRAF_Components/res/layout/gprofile_row.xml
	new file:   source/GIRAF_Components/res/layout/gtooltip_layout.xml
	new file:   source/GIRAF_Components/res/values/integers.xml
	new file:   source/GIRAF_Components/res/values/strings.xml
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GButton.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GCancelButton.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GColorAdapter.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GDialog.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GIconButton.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GList.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GProfileAdapter.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GTooltip.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GVerifyButton.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GWidgetCalendar.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GWidgetConnectivity.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GWidgetLogout.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/GWidgetUpdater.java
	new file:   source/GIRAF_Components/src/dk/aau/cs/giraf/gui/IGWidget.java
	new file:   source/Launcher/.classpath
	new file:   source/Launcher/.project
	new file:   source/Launcher/AndroidManifest.xml
	new file:   source/Launcher/assets/OasisLib_dev.jar
	new file:   source/Launcher/assets/OasisLib_dev_AuthTest.jar
	new file:   source/Launcher/assets/extendedOJ.jar
	new file:   source/Launcher/assets/robotium-solo-3.2.1.jar
	new file:   source/Launcher/gen/com/google/zxing/client/android/R.java
	new file:   source/Launcher/gen/dk/aau/cs/giraf/gui/R.java
	new file:   source/Launcher/gen/dk/aau/cs/giraf/launcher/BuildConfig.java
	new file:   source/Launcher/gen/dk/aau/cs/giraf/launcher/R.java
	new file:   source/Launcher/lint.xml
	new file:   source/Launcher/proguard-project.txt
	new file:   source/Launcher/project.properties
	new file:   source/Launcher/res/animator/instruct_ani.xml
	new file:   source/Launcher/res/animator/popupstatus.xml
	new file:   source/Launcher/res/drawable-hdpi/app_icon.png
	new file:   source/Launcher/res/drawable-hdpi/icon_giraf.png
	new file:   source/Launcher/res/drawable-hdpi/scanicon.png
	new file:   source/Launcher/res/drawable-ldpi/app_icon.png
	new file:   source/Launcher/res/drawable-mdpi/app_icon.png
	new file:   source/Launcher/res/drawable-xhdpi/app_icon.png
	new file:   source/Launcher/res/drawable/ani_00000.png
	new file:   source/Launcher/res/drawable/ani_00001.png
	new file:   source/Launcher/res/drawable/ani_00002.png
	new file:   source/Launcher/res/drawable/ani_00003.png
	new file:   source/Launcher/res/drawable/ani_00004.png
	new file:   source/Launcher/res/drawable/ani_00005.png
	new file:   source/Launcher/res/drawable/ani_00006.png
	new file:   source/Launcher/res/drawable/ani_00007.png
	new file:   source/Launcher/res/drawable/ani_00008.png
	new file:   source/Launcher/res/drawable/ani_00009.png
	new file:   source/Launcher/res/drawable/ani_00010.png
	new file:   source/Launcher/res/drawable/ani_00011.png
	new file:   source/Launcher/res/drawable/ani_00012.png
	new file:   source/Launcher/res/drawable/ani_00013.png
	new file:   source/Launcher/res/drawable/ani_00014.png
	new file:   source/Launcher/res/drawable/ani_00015.png
	new file:   source/Launcher/res/drawable/ani_00016.png
	new file:   source/Launcher/res/drawable/ani_00017.png
	new file:   source/Launcher/res/drawable/ani_00018.png
	new file:   source/Launcher/res/drawable/ani_00019.png
	new file:   source/Launcher/res/drawable/ani_00020.png
	new file:   source/Launcher/res/drawable/ani_00021.png
	new file:   source/Launcher/res/drawable/ani_00022.png
	new file:   source/Launcher/res/drawable/ani_00023.png
	new file:   source/Launcher/res/drawable/ani_00024.png
	new file:   source/Launcher/res/drawable/ani_00025.png
	new file:   source/Launcher/res/drawable/ani_00026.png
	new file:   source/Launcher/res/drawable/ani_00027.png
	new file:   source/Launcher/res/drawable/ani_00028.png
	new file:   source/Launcher/res/drawable/ani_00029.png
	new file:   source/Launcher/res/drawable/ani_00030.png
	new file:   source/Launcher/res/drawable/ani_00031.png
	new file:   source/Launcher/res/drawable/ani_00032.png
	new file:   source/Launcher/res/drawable/ani_00033.png
	new file:   source/Launcher/res/drawable/ani_00034.png
	new file:   source/Launcher/res/drawable/ani_00035.png
	new file:   source/Launcher/res/drawable/ani_00036.png
	new file:   source/Launcher/res/drawable/ani_00037.png
	new file:   source/Launcher/res/drawable/ani_00038.png
	new file:   source/Launcher/res/drawable/ani_00039.png
	new file:   source/Launcher/res/drawable/ani_00040.png
	new file:   source/Launcher/res/drawable/ani_00041.png
	new file:   source/Launcher/res/drawable/ani_00042.png
	new file:   source/Launcher/res/drawable/ani_00043.png
	new file:   source/Launcher/res/drawable/ani_00044.png
	new file:   source/Launcher/res/drawable/ani_00045.png
	new file:   source/Launcher/res/drawable/ani_00046.png
	new file:   source/Launcher/res/drawable/ani_00047.png
	new file:   source/Launcher/res/drawable/ani_00048.png
	new file:   source/Launcher/res/drawable/ani_00049.png
	new file:   source/Launcher/res/drawable/ani_00050.png
	new file:   source/Launcher/res/drawable/ani_00051.png
	new file:   source/Launcher/res/drawable/ani_00052.png
	new file:   source/Launcher/res/drawable/ani_00053.png
	new file:   source/Launcher/res/drawable/ani_00054.png
	new file:   source/Launcher/res/drawable/ani_00055.png
	new file:   source/Launcher/res/drawable/ani_00056.png
	new file:   source/Launcher/res/drawable/ani_00057.png
	new file:   source/Launcher/res/drawable/ani_00058.png
	new file:   source/Launcher/res/drawable/ani_00059.png
	new file:   source/Launcher/res/drawable/ani_00060.png
	new file:   source/Launcher/res/drawable/ani_00061.png
	new file:   source/Launcher/res/drawable/ani_00062.png
	new file:   source/Launcher/res/drawable/ani_00063.png
	new file:   source/Launcher/res/drawable/ani_00064.png
	new file:   source/Launcher/res/drawable/ani_00065.png
	new file:   source/Launcher/res/drawable/ani_00066.png
	new file:   source/Launcher/res/drawable/ani_00067.png
	new file:   source/Launcher/res/drawable/ani_00068.png
	new file:   source/Launcher/res/drawable/ani_00069.png
	new file:   source/Launcher/res/drawable/ani_00070.png
	new file:   source/Launcher/res/drawable/ani_00071.png
	new file:   source/Launcher/res/drawable/ani_00072.png
	new file:   source/Launcher/res/drawable/ani_00073.png
	new file:   source/Launcher/res/drawable/ani_00074.png
	new file:   source/Launcher/res/drawable/ani_00075.png
	new file:   source/Launcher/res/drawable/ani_00076.png
	new file:   source/Launcher/res/drawable/ani_00077.png
	new file:   source/Launcher/res/drawable/ani_00078.png
	new file:   source/Launcher/res/drawable/ani_00079.png
	new file:   source/Launcher/res/drawable/ani_00080.png
	new file:   source/Launcher/res/drawable/ani_00081.png
	new file:   source/Launcher/res/drawable/ani_00082.png
	new file:   source/Launcher/res/drawable/ani_00083.png
	new file:   source/Launcher/res/drawable/ani_00084.png
	new file:   source/Launcher/res/drawable/ani_00085.png
	new file:   source/Launcher/res/drawable/ani_00086.png
	new file:   source/Launcher/res/drawable/ani_00087.png
	new file:   source/Launcher/res/drawable/ani_00088.png
	new file:   source/Launcher/res/drawable/ani_00089.png
	new file:   source/Launcher/res/drawable/appborder.xml
	new file:   source/Launcher/res/drawable/cameraborder.xml
	new file:   source/Launcher/res/drawable/drawerbackground.xml
	new file:   source/Launcher/res/drawable/homebar_back_land.9.png
	new file:   source/Launcher/res/drawable/homebar_back_port.9.png
	new file:   source/Launcher/res/drawable/large_switch_profile.png
	new file:   source/Launcher/res/layout/apps.xml
	new file:   source/Launcher/res/layout/authentication.xml
	new file:   source/Launcher/res/layout/home.xml
	new file:   source/Launcher/res/layout/logo.xml
	new file:   source/Launcher/res/layout/profileselect.xml
	new file:   source/Launcher/res/values/strings.xml
	new file:   source/Launcher/src/dk/aau/cs/giraf/launcher/AppAdapter.java
	new file:   source/Launcher/src/dk/aau/cs/giraf/launcher/AppInfo.java
	new file:   source/Launcher/src/dk/aau/cs/giraf/launcher/AuthenticationActivity.java
	new file:   source/Launcher/src/dk/aau/cs/giraf/launcher/Data.java
	new file:   source/Launcher/src/dk/aau/cs/giraf/launcher/GAppDragger.java
	new file:   source/Launcher/src/dk/aau/cs/giraf/launcher/HomeActivity.java
	new file:   source/Launcher/src/dk/aau/cs/giraf/launcher/LogoActivity.java
	new file:   source/Launcher/src/dk/aau/cs/giraf/launcher/ProfileLauncher.java
	new file:   source/Launcher/src/dk/aau/cs/giraf/launcher/ProfileSelectActivity.java
	new file:   source/Launcher/src/dk/aau/cs/giraf/launcher/Tools.java
	new file:   source/Launcher/srcTest/dk/aau/cs/giraf/launcher/test/AllTests.java
	new file:   source/Launcher/srcTest/dk/aau/cs/giraf/launcher/test/ToolsTest.java
	new file:   source/LocalDB/.classpath
	new file:   source/LocalDB/.project
	new file:   source/LocalDB/AndroidManifest.xml
	new file:   source/LocalDB/gen/dk/aau/cs/giraf/oasis/localdb/BuildConfig.java
	new file:   source/LocalDB/gen/dk/aau/cs/giraf/oasis/localdb/R.java
	new file:   source/LocalDB/proguard.cfg
	new file:   source/LocalDB/project.properties
	new file:   source/LocalDB/res/drawable-hdpi/ic_launcher.png
	new file:   source/LocalDB/res/drawable-ldpi/ic_launcher.png
	new file:   source/LocalDB/res/drawable-mdpi/ic_launcher.png
	new file:   source/LocalDB/res/layout/main.xml
	new file:   source/LocalDB/res/values/strings.xml
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/AppsMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/AppsTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/AuthUsersMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/AuthUsersTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/DbHelper.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/DbProvider.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/DepartmentsMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/DepartmentsTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasDepartmentMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasDepartmentTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasGuardianMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasGuardianTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasLinkMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasLinkTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasSubDepartmentMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasSubDepartmentTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasTagMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/HasTagTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/ListOfAppsMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/ListOfAppsTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaDepartmentAccessMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaDepartmentAccessTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaProfileAccessMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaProfileAccessTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/MediaTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/ProfilesMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/ProfilesTable.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/TagsMetaData.java
	new file:   source/LocalDB/src/dk/aau/cs/giraf/oasis/localdb/TagsTable.java
	new file:   source/OasisApp/.classpath
	new file:   source/OasisApp/.project
	new file:   source/OasisApp/AndroidManifest.xml
	new file:   source/OasisApp/assets/OasisLib_dev.jar
	new file:   source/OasisApp/proguard.cfg
	new file:   source/OasisApp/project.properties
	new file:   source/OasisApp/res/drawable-hdpi/ic_launcher.png
	new file:   source/OasisApp/res/drawable-hdpi/logo.png
	new file:   source/OasisApp/res/drawable-hdpi/no_profile_pic.png
	new file:   source/OasisApp/res/drawable-ldpi/ic_launcher.png
	new file:   source/OasisApp/res/drawable-mdpi/ic_launcher.png
	new file:   source/OasisApp/res/drawable/tab_focused.xml
	new file:   source/OasisApp/res/drawable/tab_pressed.xml
	new file:   source/OasisApp/res/drawable/tab_selected.xml
	new file:   source/OasisApp/res/drawable/tab_selector.xml
	new file:   source/OasisApp/res/drawable/tab_text_selector.xml
	new file:   source/OasisApp/res/drawable/tab_unselected.xml
	new file:   source/OasisApp/res/layout/apps_list_item.xml
	new file:   source/OasisApp/res/layout/apps_view.xml
	new file:   source/OasisApp/res/layout/children_list_childitem.xml
	new file:   source/OasisApp/res/layout/children_list_groupitem.xml
	new file:   source/OasisApp/res/layout/children_view.xml
	new file:   source/OasisApp/res/layout/createdepartment_view.xml
	new file:   source/OasisApp/res/layout/createprofile_view.xml
	new file:   source/OasisApp/res/layout/department_list_item.xml
	new file:   source/OasisApp/res/layout/departments_view.xml
	new file:   source/OasisApp/res/layout/fourtabsview.xml
	new file:   source/OasisApp/res/layout/fragments_view.xml
	new file:   source/OasisApp/res/layout/main.xml
	new file:   source/OasisApp/res/layout/media_list_item.xml
	new file:   source/OasisApp/res/layout/media_view.xml
	new file:   source/OasisApp/res/layout/menulist_fragment_view.xml
	new file:   source/OasisApp/res/layout/modifyprofile_view.xml
	new file:   source/OasisApp/res/layout/myprofile_view.xml
	new file:   source/OasisApp/res/layout/onetabsview.xml
	new file:   source/OasisApp/res/layout/profilepopup_view.xml
	new file:   source/OasisApp/res/layout/tab.xml
	new file:   source/OasisApp/res/layout/threetabsview.xml
	new file:   source/OasisApp/res/layout/twotabsview.xml
	new file:   source/OasisApp/res/values/strings.xml
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/AllAppsFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/AllMediaFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/AppListAdapter.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ChildAllAppsFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ChildAllMediaFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ChildAppsFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ChildDepartmentsFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ChildGuardiansFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ChildListAdapter.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ChildMediaFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ChildPrivateMediaFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ChildProfileFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ChildrenFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/DepartmentListAdapter.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/DepartmentsFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ExpandableListFragment.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/FragParentTab.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/GuardiansFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/MainActivity.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/MediaListAdapter.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/MyAppsFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/MyChildrenFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/MyDepChildrenFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/MyDepartmentsFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/MyMediaFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/MyPrivateMediaFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/MyProfileFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/ProfilesFrag.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/TabManagerAllDepartments.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/TabManagerAllProfiles.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/TabManagerApp.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/TabManagerChild.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/TabManagerChildApp.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/TabManagerChildMedia.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/TabManagerMedia.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/TabManagerProfile.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/test/AppsHelperTest.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/test/DepartmentsHelperTest.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/test/MediaHelperTest.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/test/ProfilesHelperTest.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/test/TagsHelperTest.java
	new file:   source/OasisApp/src/dk/aau/cs/giraf/oasis/app/tmpListAdapter.java
	new file:   source/OasisLib/.classpath
	new file:   source/OasisLib/.project
	new file:   source/OasisLib/AndroidManifest.xml
	new file:   source/OasisLib/doc/allclasses-frame.html
	new file:   source/OasisLib/doc/allclasses-noframe.html
	new file:   source/OasisLib/doc/constant-values.html
	new file:   source/OasisLib/doc/deprecated-list.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/Helper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/class-use/Helper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/AppsHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/AuthUsersController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/DepartmentsHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/HasDepartmentController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/HasGuardianController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/HasLinkController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/HasSubDepartmentController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/HasTagController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/ListOfAppsController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/ListOfAppsHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/MediaDepartmentAccessController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/MediaHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/MediaProfileAccessController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/ProfilesHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/ProfilesHelper.pRoles.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/ServerHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/TagsHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/AppsHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/AuthUsersController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/DepartmentsHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/HasDepartmentController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/HasGuardianController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/HasLinkController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/HasSubDepartmentController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/HasTagController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/ListOfAppsController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/ListOfAppsHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/MediaDepartmentAccessController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/MediaHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/MediaProfileAccessController.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/ProfilesHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/ProfilesHelper.pRoles.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/ServerHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/class-use/TagsHelper.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/package-frame.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/package-summary.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/package-tree.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/controllers/package-use.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/AppsMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/AppsMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/AuthUsersMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/AuthUsersMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/DepartmentsMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/DepartmentsMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/HasDepartmentMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/HasDepartmentMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/HasGuardianMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/HasGuardianMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/HasLinkMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/HasLinkMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/HasSubDepartmentMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/HasSubDepartmentMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/HasTagMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/HasTagMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/ListOfAppsMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/ListOfAppsMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/MediaDepartmentAccessMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/MediaDepartmentAccessMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/MediaMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/MediaMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/MediaProfileAccessMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/MediaProfileAccessMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/ProfilesMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/ProfilesMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/TagsMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/TagsMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/AppsMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/AppsMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/AuthUsersMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/AuthUsersMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/DepartmentsMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/DepartmentsMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/HasDepartmentMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/HasDepartmentMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/HasGuardianMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/HasGuardianMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/HasLinkMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/HasLinkMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/HasSubDepartmentMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/HasSubDepartmentMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/HasTagMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/HasTagMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/ListOfAppsMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/ListOfAppsMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/MediaDepartmentAccessMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/MediaDepartmentAccessMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/MediaMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/MediaMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/MediaProfileAccessMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/MediaProfileAccessMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/ProfilesMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/ProfilesMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/TagsMetaData.Table.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/class-use/TagsMetaData.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/package-frame.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/package-summary.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/package-tree.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/metadata/package-use.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/App.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/AuthUser.aRole.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/AuthUser.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/Department.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/EqualsUtil.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/HasDepartment.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/HasGuardian.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/HasLink.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/HasSubDepartment.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/HasTag.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/ListOfApps.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/Media.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/MediaDepartmentAccess.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/MediaProfileAccess.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/Profile.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/Profile.pRoles.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/Setting.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/Stat.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/Tag.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/App.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/AuthUser.aRole.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/AuthUser.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/Department.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/EqualsUtil.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/HasDepartment.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/HasGuardian.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/HasLink.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/HasSubDepartment.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/HasTag.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/ListOfApps.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/Media.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/MediaDepartmentAccess.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/MediaProfileAccess.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/Profile.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/Profile.pRoles.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/Setting.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/Stat.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/class-use/Tag.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/package-frame.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/package-summary.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/package-tree.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/models/package-use.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/package-frame.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/package-summary.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/package-tree.html
	new file:   source/OasisLib/doc/dk/aau/cs/giraf/oasis/lib/package-use.html
	new file:   source/OasisLib/doc/help-doc.html
	new file:   source/OasisLib/doc/index-files/index-1.html
	new file:   source/OasisLib/doc/index-files/index-10.html
	new file:   source/OasisLib/doc/index-files/index-11.html
	new file:   source/OasisLib/doc/index-files/index-12.html
	new file:   source/OasisLib/doc/index-files/index-13.html
	new file:   source/OasisLib/doc/index-files/index-14.html
	new file:   source/OasisLib/doc/index-files/index-15.html
	new file:   source/OasisLib/doc/index-files/index-16.html
	new file:   source/OasisLib/doc/index-files/index-17.html
	new file:   source/OasisLib/doc/index-files/index-18.html
	new file:   source/OasisLib/doc/index-files/index-2.html
	new file:   source/OasisLib/doc/index-files/index-3.html
	new file:   source/OasisLib/doc/index-files/index-4.html
	new file:   source/OasisLib/doc/index-files/index-5.html
	new file:   source/OasisLib/doc/index-files/index-6.html
	new file:   source/OasisLib/doc/index-files/index-7.html
	new file:   source/OasisLib/doc/index-files/index-8.html
	new file:   source/OasisLib/doc/index-files/index-9.html
	new file:   source/OasisLib/doc/index.html
	new file:   source/OasisLib/doc/overview-frame.html
	new file:   source/OasisLib/doc/overview-summary.html
	new file:   source/OasisLib/doc/overview-tree.html
	new file:   source/OasisLib/doc/package-list
	new file:   source/OasisLib/doc/resources/inherit.gif
	new file:   source/OasisLib/doc/serialized-form.html
	new file:   source/OasisLib/doc/stylesheet.css
	new file:   source/OasisLib/gen/dk/aau/cs/giraf/oasis/lib/BuildConfig.java
	new file:   source/OasisLib/gen/dk/aau/cs/giraf/oasis/lib/R.java
	new file:   source/OasisLib/proguard.cfg
	new file:   source/OasisLib/project.properties
	new file:   source/OasisLib/res/drawable-hdpi/ic_launcher.png
	new file:   source/OasisLib/res/drawable-ldpi/ic_launcher.png
	new file:   source/OasisLib/res/drawable-mdpi/ic_launcher.png
	new file:   source/OasisLib/res/layout/main.xml
	new file:   source/OasisLib/res/values/strings.xml
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/Helper.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/AppsHelper.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/AuthUsersController.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/DepartmentsHelper.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/HasDepartmentController.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/HasGuardianController.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/HasLinkController.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/HasSubDepartmentController.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/HasTagController.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/ListOfAppsController.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/MediaDepartmentAccessController.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/MediaHelper.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/MediaProfileAccessController.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/ProfilesHelper.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/ServerHelper.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/controllers/TagsHelper.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/AppsMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/AuthUsersMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/DepartmentsMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/HasDepartmentMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/HasGuardianMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/HasLinkMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/HasSubDepartmentMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/HasTagMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/ListOfAppsMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/MediaDepartmentAccessMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/MediaMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/MediaProfileAccessMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/ProfilesMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/metadata/TagsMetaData.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/App.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/AuthUser.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/Department.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/EqualsUtil.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/HasDepartment.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/HasGuardian.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/HasLink.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/HasSubDepartment.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/HasTag.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/ListOfApps.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/Media.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/MediaDepartmentAccess.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/MediaProfileAccess.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/Profile.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/Setting.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/Stat.java
	new file:   source/OasisLib/src/dk/aau/cs/giraf/oasis/lib/models/Tag.java
	new file:   source/PARROT/.classpath
	new file:   source/PARROT/.project
	new file:   source/PARROT/AndroidManifest.xml
	new file:   source/PARROT/build.xml
	new file:   source/PARROT/proguard-project.txt
	new file:   source/PARROT/proguard.cfg
	new file:   source/PARROT/project.properties
	new file:   source/PARROT/res/drawable-hdpi/background.xml
	new file:   source/PARROT/res/drawable-hdpi/button.xml
	new file:   source/PARROT/res/drawable-hdpi/catbuttonlayout.xml
	new file:   source/PARROT/res/drawable-hdpi/catlayout.xml
	new file:   source/PARROT/res/drawable-hdpi/gridviewlayout.xml
	new file:   source/PARROT/res/drawable-hdpi/ic_launcher.png
	new file:   source/PARROT/res/drawable-hdpi/optionsbackground.xml
	new file:   source/PARROT/res/drawable-hdpi/parrot.jpg
	new file:   source/PARROT/res/drawable-hdpi/play.png
	new file:   source/PARROT/res/drawable-hdpi/record.png
	new file:   source/PARROT/res/drawable-hdpi/sentenceboardlayout.xml
	new file:   source/PARROT/res/drawable-hdpi/stop.png
	new file:   source/PARROT/res/drawable-hdpi/trashbin.png
	new file:   source/PARROT/res/drawable-hdpi/usynlig.png
	new file:   source/PARROT/res/drawable-ldpi/ic_launcher.png
	new file:   source/PARROT/res/drawable-ldpi/play.png
	new file:   source/PARROT/res/drawable-ldpi/record.png
	new file:   source/PARROT/res/drawable-ldpi/stop.png
	new file:   source/PARROT/res/drawable-mdpi/ic_launcher.png
	new file:   source/PARROT/res/drawable-mdpi/play.png
	new file:   source/PARROT/res/drawable-mdpi/record.png
	new file:   source/PARROT/res/drawable-mdpi/stop.png
	new file:   source/PARROT/res/layout/categoriesitem.xml
	new file:   source/PARROT/res/layout/main.xml
	new file:   source/PARROT/res/layout/managecategory_layout.xml
	new file:   source/PARROT/res/layout/options_layout.xml
	new file:   source/PARROT/res/layout/pictogramview.xml
	new file:   source/PARROT/res/layout/speechboard_layout.xml
	new file:   source/PARROT/res/values/strings.xml
	new file:   source/PARROT/res/values/textstyles.xml
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/AudioPlayer.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/ListViewAdapter.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/ManageCategoryFragment.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/ManagementBoxDragListener.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/OptionsFragment.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/PARROTActivity.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/PARROTCategory.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/PARROTCategoryAdapter.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/PARROTDataLoader.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/PARROTProfile.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/Pictogram.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/PictogramAdapter.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/SpeechBoardBoxDragListener.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/SpeechBoardFragment.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/TabListener.java
	new file:   source/PARROT/src/dk/aau/cs/giraf/parrot/TestData.java
	new file:   source/PictoAdmin/.classpath
	new file:   source/PictoAdmin/.project
	new file:   source/PictoAdmin/AndroidManifest.xml
	new file:   source/PictoAdmin/build.xml
	new file:   source/PictoAdmin/gen/dk/aau/cs/giraf/oasis/lib/R.java
	new file:   source/PictoAdmin/gen/dk/aau/cs/giraf/pictoadmin/BuildConfig.java
	new file:   source/PictoAdmin/gen/dk/aau/cs/giraf/pictoadmin/R.java
	new file:   source/PictoAdmin/ic_launcher-web.png
	new file:   source/PictoAdmin/libs/android-support-v4.jar
	new file:   source/PictoAdmin/lint.xml
	new file:   source/PictoAdmin/proguard-project.txt
	new file:   source/PictoAdmin/project.properties
	new file:   source/PictoAdmin/res/drawable-hdpi/action_about.png
	new file:   source/PictoAdmin/res/drawable-hdpi/action_help.png
	new file:   source/PictoAdmin/res/drawable-hdpi/collections_collection.png
	new file:   source/PictoAdmin/res/drawable-hdpi/content_discard.png
	new file:   source/PictoAdmin/res/drawable-hdpi/content_new_picture.png
	new file:   source/PictoAdmin/res/drawable-hdpi/content_save.png
	new file:   source/PictoAdmin/res/drawable-hdpi/device_access_camera.png
	new file:   source/PictoAdmin/res/drawable-hdpi/ic_action_search.png
	new file:   source/PictoAdmin/res/drawable-hdpi/ic_launcher.png
	new file:   source/PictoAdmin/res/drawable-hdpi/navigation_accept.png
	new file:   source/PictoAdmin/res/drawable-hdpi/navigation_back.png
	new file:   source/PictoAdmin/res/drawable-hdpi/navigation_cancel.png
	new file:   source/PictoAdmin/res/drawable-mdpi/action_about.png
	new file:   source/PictoAdmin/res/drawable-mdpi/action_help.png
	new file:   source/PictoAdmin/res/drawable-mdpi/collections_view_as_list.png
	new file:   source/PictoAdmin/res/drawable-mdpi/content_discard.png
	new file:   source/PictoAdmin/res/drawable-mdpi/content_new_picture.png
	new file:   source/PictoAdmin/res/drawable-mdpi/content_save.png
	new file:   source/PictoAdmin/res/drawable-mdpi/device_access_camera.png
	new file:   source/PictoAdmin/res/drawable-mdpi/ic_action_search.png
	new file:   source/PictoAdmin/res/drawable-mdpi/ic_launcher.png
	new file:   source/PictoAdmin/res/drawable-mdpi/navigation_accept.png
	new file:   source/PictoAdmin/res/drawable-mdpi/navigation_back.png
	new file:   source/PictoAdmin/res/drawable-mdpi/navigation_cancel.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/action_about.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/action_help.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/collections_view_as_list.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/content_discard.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/content_new_picture.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/content_save.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/device_access_camera.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/ic_action_search.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/ic_launcher.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/navigation_accept.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/navigation_back.png
	new file:   source/PictoAdmin/res/drawable-xhdpi/navigation_cancel.png
	new file:   source/PictoAdmin/res/drawable-xxhdpi/ic_launcher.png
	new file:   source/PictoAdmin/res/layout/activity_admin_category.xml
	new file:   source/PictoAdmin/res/layout/activity_help_menu.xml
	new file:   source/PictoAdmin/res/layout/activity_picto_admin_main.xml
	new file:   source/PictoAdmin/res/menu/activity_admin_category.xml
	new file:   source/PictoAdmin/res/menu/activity_help_menu.xml
	new file:   source/PictoAdmin/res/menu/picto_admin_main.xml
	new file:   source/PictoAdmin/res/values-sw600dp/dimens.xml
	new file:   source/PictoAdmin/res/values-sw720dp-land/dimens.xml
	new file:   source/PictoAdmin/res/values-v11/styles.xml
	new file:   source/PictoAdmin/res/values/dimens.xml
	new file:   source/PictoAdmin/res/values/strings.xml
	new file:   source/PictoAdmin/res/values/styles.xml
	new file:   source/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/AdminCategory.java
	new file:   source/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/DatabaseHandler.java
	new file:   source/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/HelpMenu.java
	new file:   source/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/PictoAdminMain.java
	new file:   source/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/PlaceHolder.java
	new file:   source/TimerLib/.classpath
	new file:   source/TimerLib/.project
	new file:   source/TimerLib/AndroidManifest.xml
	new file:   source/TimerLib/gen/dk/aau/cs/giraf/TimerLib/BuildConfig.java
	new file:   source/TimerLib/proguard.cfg
	new file:   source/TimerLib/project.properties
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/Art.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/Attachment.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/CRUD.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/Child.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/DigitalClock.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/Guardian.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/Hourglass.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/ProgressBar.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/SingleImg.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/SplitImg.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/SubProfile.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/TimeTimer.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/Timer.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/TimerHelper.java
	new file:   source/TimerLib/src/dk/aau/cs/giraf/TimerLib/formFactor.java
	new file:   source/Wombat/.classpath
	new file:   source/Wombat/.project
	new file:   source/Wombat/AndroidManifest.xml
	new file:   source/Wombat/libs/OasisLib_dev.jar
	new file:   source/Wombat/proguard-project.txt
	new file:   source/Wombat/project.properties
	new file:   source/Wombat/res/drawable-hdpi/checkmark.png
	new file:   source/Wombat/res/drawable-hdpi/default_profile.png
	new file:   source/Wombat/res/drawable-hdpi/ic_launcher.png
	new file:   source/Wombat/res/drawable-hdpi/last_used.png
	new file:   source/Wombat/res/drawable-hdpi/p_done.png
	new file:   source/Wombat/res/drawable-hdpi/p_gaa_til_skema.png
	new file:   source/Wombat/res/drawable-hdpi/p_gaa_til_taxa.png
	new file:   source/Wombat/res/drawable-hdpi/p_ryd_op.png
	new file:   source/Wombat/res/drawable-hdpi/predef.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_attachment.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_digital.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_dual_pic.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_hourglass.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_progressbar.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_save.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_save_gray.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_saveas.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_saveas_gray.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_single_pic.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_start.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_start_gray.png
	new file:   source/Wombat/res/drawable-hdpi/thumbnail_timetimer.png
	new file:   source/Wombat/res/drawable-hdpi/wombat_icon.png
	new file:   source/Wombat/res/drawable/attachment_background.xml
	new file:   source/Wombat/res/drawable/attachment_layer.xml
	new file:   source/Wombat/res/drawable/background.xml
	new file:   source/Wombat/res/drawable/btn.xml
	new file:   source/Wombat/res/drawable/btn_normal.xml
	new file:   source/Wombat/res/drawable/btn_pressed.xml
	new file:   source/Wombat/res/drawable/checkbox.xml
	new file:   source/Wombat/res/drawable/color_btn.xml
	new file:   source/Wombat/res/drawable/color_btn_normal.xml
	new file:   source/Wombat/res/drawable/list.xml
	new file:   source/Wombat/res/drawable/list_normal.xml
	new file:   source/Wombat/res/drawable/list_pressed.xml
	new file:   source/Wombat/res/drawable/list_selected.xml
	new file:   source/Wombat/res/drawable/timer_button.xml
	new file:   source/Wombat/res/drawable/wdialog_background.xml
	new file:   source/Wombat/res/layout/customize.xml
	new file:   source/Wombat/res/layout/details.xml
	new file:   source/Wombat/res/layout/main.xml
	new file:   source/Wombat/res/layout/profile_list.xml
	new file:   source/Wombat/res/layout/profile_list_dialog.xml
	new file:   source/Wombat/res/layout/profile_list_item.xml
	new file:   source/Wombat/res/layout/subprofile_list.xml
	new file:   source/Wombat/res/layout/subprofile_list_item.xml
	new file:   source/Wombat/res/layout/wdialog.xml
	new file:   source/Wombat/res/values/profiles.xml
	new file:   source/Wombat/res/values/strings.xml
	new file:   source/Wombat/res/values/wombat_style.xml
	new file:   source/Wombat/src/dk/aau/cs/giraf/wombat/ArtAdapter.java
	new file:   source/Wombat/src/dk/aau/cs/giraf/wombat/ChildAdapter.java
	new file:   source/Wombat/src/dk/aau/cs/giraf/wombat/ChildFragment.java
	new file:   source/Wombat/src/dk/aau/cs/giraf/wombat/CustomizeFragment.java
	new file:   source/Wombat/src/dk/aau/cs/giraf/wombat/MainActivity.java
	new file:   source/Wombat/src/dk/aau/cs/giraf/wombat/ModeAdapter.java
	new file:   source/Wombat/src/dk/aau/cs/giraf/wombat/SubProfileAdapter.java
	new file:   source/Wombat/src/dk/aau/cs/giraf/wombat/SubProfileFragment.java
	new file:   source/Wombat/src/dk/aau/cs/giraf/wombat/WCheckbox.java
	new file:   source/Wombat/src/dk/aau/cs/giraf/wombat/WDialog.java
	new file:   source/android/.classpath
	new file:   source/android/.project
	new file:   source/android/AndroidManifest.xml
	new file:   source/android/ant.properties
	new file:   source/android/assets/html-en/about1d.html
	new file:   source/android/assets/html-en/about2d.html
	new file:   source/android/assets/html-en/index.html
	new file:   source/android/assets/html-en/scanning.html
	new file:   source/android/assets/html-en/sharing.html
	new file:   source/android/assets/html-en/whatsnew.html
	new file:   source/android/assets/images/big-1d.png
	new file:   source/android/assets/images/big-datamatrix.png
	new file:   source/android/assets/images/big-qr.png
	new file:   source/android/assets/images/contact-results-screen.jpg
	new file:   source/android/assets/images/demo-no.png
	new file:   source/android/assets/images/demo-yes.png
	new file:   source/android/assets/images/scan-example.png
	new file:   source/android/assets/images/scan-from-phone.png
	new file:   source/android/assets/images/search-book-contents.jpg
	new file:   source/android/assets/style.css
	new file:   source/android/build.xml
	new file:   source/android/gen/com/google/zxing/client/android/BuildConfig.java
	new file:   source/android/gen/com/google/zxing/client/android/R.java
	new file:   source/android/libs/core.jar
	new file:   source/android/proguard.cfg
	new file:   source/android/project.properties
	new file:   source/android/res/drawable-hdpi/launcher_icon.png
	new file:   source/android/res/drawable-hdpi/shopper_icon.png
	new file:   source/android/res/drawable/launcher_icon.png
	new file:   source/android/res/drawable/share_via_barcode.png
	new file:   source/android/res/drawable/shopper_icon.png
	new file:   source/android/res/layout-land/encode.xml
	new file:   source/android/res/layout-land/share.xml
	new file:   source/android/res/layout-ldpi/capture.xml
	new file:   source/android/res/layout/bookmark_picker_list_item.xml
	new file:   source/android/res/layout/capture.xml
	new file:   source/android/res/layout/encode.xml
	new file:   source/android/res/layout/help.xml
	new file:   source/android/res/layout/history_list_item.xml
	new file:   source/android/res/layout/search_book_contents.xml
	new file:   source/android/res/layout/search_book_contents_header.xml
	new file:   source/android/res/layout/search_book_contents_list_item.xml
	new file:   source/android/res/layout/share.xml
	new file:   source/android/res/raw/beep.ogg
	new file:   source/android/res/values-ar/strings.xml
	new file:   source/android/res/values-bg/strings.xml
	new file:   source/android/res/values-ca/strings.xml
	new file:   source/android/res/values-cs/strings.xml
	new file:   source/android/res/values-da/strings.xml
	new file:   source/android/res/values-de/strings.xml
	new file:   source/android/res/values-el/strings.xml
	new file:   source/android/res/values-es/strings.xml
	new file:   source/android/res/values-eu/strings.xml
	new file:   source/android/res/values-fi/strings.xml
	new file:   source/android/res/values-fr/strings.xml
	new file:   source/android/res/values-he/strings.xml
	new file:   source/android/res/values-hi/strings.xml
	new file:   source/android/res/values-hu/strings.xml
	new file:   source/android/res/values-id/strings.xml
	new file:   source/android/res/values-it/strings.xml
	new file:   source/android/res/values-iw/strings.xml
	new file:   source/android/res/values-ja/strings.xml
	new file:   source/android/res/values-ko/strings.xml
	new file:   source/android/res/values-nl/strings.xml
	new file:   source/android/res/values-pl/strings.xml
	new file:   source/android/res/values-pt/strings.xml
	new file:   source/android/res/values-ru/strings.xml
	new file:   source/android/res/values-sk/strings.xml
	new file:   source/android/res/values-sl/strings.xml
	new file:   source/android/res/values-sv/strings.xml
	new file:   source/android/res/values-tr/strings.xml
	new file:   source/android/res/values-zh-rCN/strings.xml
	new file:   source/android/res/values-zh-rTW/strings.xml
	new file:   source/android/res/values/arrays.xml
	new file:   source/android/res/values/colors.xml
	new file:   source/android/res/values/ids.xml
	new file:   source/android/res/values/strings.xml
	new file:   source/android/res/xml/preferences.xml
	new file:   source/android/src/com/google/zxing/client/android/BeepManager.java
	new file:   source/android/src/com/google/zxing/client/android/CaptureActivity.java
	new file:   source/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
	new file:   source/android/src/com/google/zxing/client/android/Contents.java
	new file:   source/android/src/com/google/zxing/client/android/DecodeFormatManager.java
	new file:   source/android/src/com/google/zxing/client/android/DecodeHandler.java
	new file:   source/android/src/com/google/zxing/client/android/DecodeThread.java
	new file:   source/android/src/com/google/zxing/client/android/FinishListener.java
	new file:   source/android/src/com/google/zxing/client/android/HelpActivity.java
	new file:   source/android/src/com/google/zxing/client/android/HttpHelper.java
	new file:   source/android/src/com/google/zxing/client/android/InactivityTimer.java
	new file:   source/android/src/com/google/zxing/client/android/IntentSource.java
	new file:   source/android/src/com/google/zxing/client/android/Intents.java
	new file:   source/android/src/com/google/zxing/client/android/LocaleManager.java
	new file:   source/android/src/com/google/zxing/client/android/PlanarYUVLuminanceSource.java
	new file:   source/android/src/com/google/zxing/client/android/PreferencesActivity.java
	new file:   source/android/src/com/google/zxing/client/android/ViewfinderResultPointCallback.java
	new file:   source/android/src/com/google/zxing/client/android/ViewfinderView.java
	new file:   source/android/src/com/google/zxing/client/android/book/BrowseBookListener.java
	new file:   source/android/src/com/google/zxing/client/android/book/NetworkWorker.java
	new file:   source/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java
	new file:   source/android/src/com/google/zxing/client/android/book/SearchBookContentsAdapter.java
	new file:   source/android/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java
	new file:   source/android/src/com/google/zxing/client/android/book/SearchBookContentsResult.java
	new file:   source/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java
	new file:   source/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
	new file:   source/android/src/com/google/zxing/client/android/camera/CameraManager.java
	new file:   source/android/src/com/google/zxing/client/android/camera/PreviewCallback.java
	new file:   source/android/src/com/google/zxing/client/android/encode/ContactEncoder.java
	new file:   source/android/src/com/google/zxing/client/android/encode/EncodeActivity.java
	new file:   source/android/src/com/google/zxing/client/android/encode/Formatter.java
	new file:   source/android/src/com/google/zxing/client/android/encode/MECARDContactEncoder.java
	new file:   source/android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java
	new file:   source/android/src/com/google/zxing/client/android/encode/VCardContactEncoder.java
	new file:   source/android/src/com/google/zxing/client/android/history/DBHelper.java
	new file:   source/android/src/com/google/zxing/client/android/history/HistoryActivity.java
	new file:   source/android/src/com/google/zxing/client/android/history/HistoryItem.java
	new file:   source/android/src/com/google/zxing/client/android/history/HistoryItemAdapter.java
	new file:   source/android/src/com/google/zxing/client/android/history/HistoryManager.java
	new file:   source/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/CalendarResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/EmailAddressResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/GeoResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/ISBNResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/ProductResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/ResultButtonListener.java
	new file:   source/android/src/com/google/zxing/client/android/result/ResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/ResultHandlerFactory.java
	new file:   source/android/src/com/google/zxing/client/android/result/SMSResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/TelResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/TextResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/URIResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/WifiResultHandler.java
	new file:   source/android/src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java
	new file:   source/android/src/com/google/zxing/client/android/result/supplement/KillerCallable.java
	new file:   source/android/src/com/google/zxing/client/android/result/supplement/ProductResultInfoRetriever.java
	new file:   source/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
	new file:   source/android/src/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.java
	new file:   source/android/src/com/google/zxing/client/android/share/AppPickerActivity.java
	new file:   source/android/src/com/google/zxing/client/android/share/BookmarkAdapter.java
	new file:   source/android/src/com/google/zxing/client/android/share/BookmarkPickerActivity.java
	new file:   source/android/src/com/google/zxing/client/android/share/LoadPackagesAsyncTask.java
	new file:   source/android/src/com/google/zxing/client/android/share/ShareActivity.java
	new file:   source/android/src/com/google/zxing/client/android/wifi/NetworkType.java
	new file:   source/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java
	new file:   source/wheel/.classpath
	new file:   source/wheel/.project
	new file:   source/wheel/AndroidManifest.xml
	new file:   source/wheel/gen/kankan/wheel/BuildConfig.java
	new file:   source/wheel/gen/kankan/wheel/R.java
	new file:   source/wheel/project.properties
	new file:   source/wheel/res/drawable/wheel_bg.xml
	new file:   source/wheel/res/drawable/wheel_val.xml
	new file:   source/wheel/src/kankan/wheel/widget/ItemsRange.java
	new file:   source/wheel/src/kankan/wheel/widget/OnWheelChangedListener.java
	new file:   source/wheel/src/kankan/wheel/widget/OnWheelClickedListener.java
	new file:   source/wheel/src/kankan/wheel/widget/OnWheelScrollListener.java
	new file:   source/wheel/src/kankan/wheel/widget/WheelAdapter.java
	new file:   source/wheel/src/kankan/wheel/widget/WheelRecycle.java
	new file:   source/wheel/src/kankan/wheel/widget/WheelScroller.java
	new file:   source/wheel/src/kankan/wheel/widget/WheelView.java
	new file:   source/wheel/src/kankan/wheel/widget/adapters/AbstractWheelAdapter.java
	new file:   source/wheel/src/kankan/wheel/widget/adapters/AbstractWheelTextAdapter.java
	new file:   source/wheel/src/kankan/wheel/widget/adapters/AdapterWheel.java
	new file:   source/wheel/src/kankan/wheel/widget/adapters/ArrayWheelAdapter.java
	new file:   source/wheel/src/kankan/wheel/widget/adapters/NumericWheelAdapter.java
	new file:   source/wheel/src/kankan/wheel/widget/adapters/WheelViewAdapter.java
	modified:   blah/workspace/android/res/values-ar/strings.xml
	modified:   blah/workspace/android/res/values-bg/strings.xml
	modified:   blah/workspace/android/res/values-el/strings.xml
	modified:   blah/workspace/android/res/values-he/strings.xml
	modified:   blah/workspace/android/res/values-hi/strings.xml
	modified:   blah/workspace/android/res/values-iw/strings.xml
	modified:   blah/workspace/android/res/values-ja/strings.xml
	modified:   blah/workspace/android/res/values-ko/strings.xml
	modified:   blah/workspace/android/res/values-pl/strings.xml
modified:   blah/workspace/android/res/values-ru/strings.xml
	modified:   blah/workspace/android/res/values-zh-rCN/strings.xml
	modified:   blah/workspace/android/res/values-zh-rTW/strings.xml
Merge branch 'master' of https://github.com/WhyNotZoidberg/SW6Parrot
git hold nu op med at drill
hold nu op med det shit
Merge branch 'master' of https://github.com/WhyNotZoidberg/SW6Parrot
stop
Merge branch 'master' of https://github.com/WhyNotZoidberg/SW6Parrot
clean start