From 30d164851ac3d4e7397e010baa24a8e5cb0dc090 Mon Sep 17 00:00:00 2001
From: Joe Robinson <joe@lc8n.com>
Date: Tue, 15 Dec 2015 20:43:45 +0000
Subject: Migrate to IntelliJ format, also contains some minor logging changes
 and moved libraries

---
 .../intermediates/incremental/mergeDebugResources/merger.xml      | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 app/build/intermediates/incremental/mergeDebugResources/merger.xml

(limited to 'app/build/intermediates/incremental/mergeDebugResources')

diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
new file mode 100644
index 0000000..519627a
--- /dev/null
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main$Generated" generated="true"><source path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res"/><source path="/home/joe/AndroidstudioProjects/blauploader1/app/build/generated/res/rs/debug"/><source path="/home/joe/AndroidstudioProjects/blauploader1/app/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/home/joe/AndroidstudioProjects/blauploader1/app/src/debug/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res"><file name="icon" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-hdpi/icon.png" qualifiers="hdpi-v4" type="drawable"/><file name="marcus72" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-hdpi/marcus72.png" qualifiers="hdpi-v4" type="drawable"/><file name="binary" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/binary.png" qualifiers="ldpi-v4" type="drawable"/><file name="compressed" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/compressed.png" qualifiers="ldpi-v4" type="drawable"/><file name="folder" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/folder.png" qualifiers="ldpi-v4" type="drawable"/><file name="generic" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/generic.png" qualifiers="ldpi-v4" type="drawable"/><file name="icon" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/icon.png" qualifiers="ldpi-v4" type="drawable"/><file name="image" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/image.png" qualifiers="ldpi-v4" type="drawable"/><file name="link" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/link.png" qualifiers="ldpi-v4" type="drawable"/><file name="movie" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/movie.png" qualifiers="ldpi-v4" type="drawable"/><file name="music" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/music.png" qualifiers="ldpi-v4" type="drawable"/><file name="text" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/text.png" qualifiers="ldpi-v4" type="drawable"/><file name="unknown" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-ldpi/unknown.png" qualifiers="ldpi-v4" type="drawable"/><file name="icon" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-mdpi/icon.png" qualifiers="mdpi-v4" type="drawable"/><file name="up_arrow" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/drawable-mdpi/up_arrow.png" qualifiers="mdpi-v4" type="drawable"/><file name="browser" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/layout/browser.xml" qualifiers="" type="layout"/><file name="filerow" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/layout/filerow.xml" qualifiers="" type="layout"/><file name="home" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/layout/home.xml" qualifiers="" type="layout"/><file name="share" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/layout/share.xml" qualifiers="" type="layout"/><file name="soundrecorder" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/layout/soundrecorder.xml" qualifiers="" type="layout"/><file name="upload" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/layout/upload.xml" qualifiers="" type="layout"/><file name="uploadlocation" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/layout/uploadlocation.xml" qualifiers="" type="layout"/><file name="menu" path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/menu/menu.xml" qualifiers="" type="menu"/><file path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/values-v11/strings.xml" qualifiers="v11"><string name="hello">Hello World, fileBrowser!</string><string name="cancel">Cancel</string><string name="app_name">blauploader</string></file><file path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/values-v11/themes.xml" qualifiers="v11"><style name="LightTheme" parent="@android:style/Theme.Holo.Light">
+        <!-- Any customizations for your app running on pre-3.0 devices here -->
+    </style></file><file path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/values-v14/strings.xml" qualifiers="v14"><string name="cancel">Cancel</string><string name="hello">Hello World, fileBrowser!</string><string name="app_name">blauploader</string></file><file path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/values-v14/themes.xml" qualifiers="v14"><style name="LightTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
+        <!-- Any customizations for your app running on pre-3.0 devices here -->
+    </style></file><file path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/values/themes.xml" qualifiers=""><style name="LightTheme" parent="@android:style/Theme.Light">
+        <!-- Any customizations for your app running on pre-3.0 devices here -->
+    </style></file><file path="/home/joe/AndroidstudioProjects/blauploader1/app/src/main/res/values/strings.xml" qualifiers=""><string name="hello">Hello World, fileBrowser!</string><string name="hello_world">Hello world!</string><string name="menu_settings">Settings</string><string name="app_name">up.org.je</string><string name="cancel">Cancel</string><string name="title_activity_main">MainActivity</string></file></source><source path="/home/joe/AndroidstudioProjects/blauploader1/app/build/generated/res/rs/debug"/><source path="/home/joe/AndroidstudioProjects/blauploader1/app/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="/home/joe/AndroidstudioProjects/blauploader1/app/src/debug/res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
-- 
cgit v1.2.3