From: kenstir <kenstir@gmail.com>
Date: Sat, 21 Nov 2015 23:29:23 +0000 (-0500)
Subject: Added hemlock logos, removed some project-level excludes
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6b38132ff205fb208bbb2a8f96ae2fbfa4f5c3df;p=working%2FEvergreen.git

Added hemlock logos, removed some project-level excludes
---

diff --git a/Open-ILS/src/Android/core/core.iml b/Open-ILS/src/Android/core/core.iml
index 5c2fda5eb9..bb3df034db 100644
--- a/Open-ILS/src/Android/core/core.iml
+++ b/Open-ILS/src/Android/core/core.iml
@@ -17,6 +17,7 @@
     <content url="file://$MODULE_DIR$/../opensrf">
       <sourceFolder url="file://$MODULE_DIR$/../opensrf/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../opensrf/src/org/opensrf/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/../opensrf/src/org/opensrf/net/xmpp" />
       <excludeFolder url="file://$MODULE_DIR$/../opensrf/src/org/opensrf/test" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/Open-ILS/src/Android/eg_app/.idea/compiler.xml b/Open-ILS/src/Android/eg_app/.idea/compiler.xml
index c006a22fa1..357fde0a32 100644
--- a/Open-ILS/src/Android/eg_app/.idea/compiler.xml
+++ b/Open-ILS/src/Android/eg_app/.idea/compiler.xml
@@ -4,7 +4,6 @@
     <option name="DEFAULT_COMPILER" value="Javac" />
     <excludeFromCompile>
       <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/util/Cache.java" />
-      <directory url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/net/xmpp" includeSubdirectories="true" />
       <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/Stack.java" />
       <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/Session.java" />
       <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/Sys.java" />
@@ -13,10 +12,8 @@
       <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/MultiSession.java" />
       <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/ServerSession.java" />
       <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/util/SettingsClient.java" />
-      <file url="file://$PROJECT_DIR$/../core/src/org/open_ils/test/TestLogin.java" />
       <file url="file://$PROJECT_DIR$/../core/src/org/open_ils/util/Utils.java" />
       <file url="file://$PROJECT_DIR$/../core/src/org/open_ils/Sys.java" />
-      <directory url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/test" includeSubdirectories="true" />
       <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/util/XMLFlattener.java" />
     </excludeFromCompile>
     <resourceExtensions />
diff --git a/Open-ILS/src/Android/logos/hemlock_feature.pdn b/Open-ILS/src/Android/logos/hemlock_feature.pdn
new file mode 100644
index 0000000000..224740f042
Binary files /dev/null and b/Open-ILS/src/Android/logos/hemlock_feature.pdn differ
diff --git a/Open-ILS/src/Android/logos/hemlock_feature.png b/Open-ILS/src/Android/logos/hemlock_feature.png
new file mode 100644
index 0000000000..d6b15842e3
Binary files /dev/null and b/Open-ILS/src/Android/logos/hemlock_feature.png differ
diff --git a/Open-ILS/src/Android/logos/hemlock_images.pdn b/Open-ILS/src/Android/logos/hemlock_images.pdn
new file mode 100644
index 0000000000..aea1f73f0f
Binary files /dev/null and b/Open-ILS/src/Android/logos/hemlock_images.pdn differ
diff --git a/Open-ILS/src/Android/logos/hemlock_tall.png b/Open-ILS/src/Android/logos/hemlock_tall.png
new file mode 100644
index 0000000000..d4689a53f9
Binary files /dev/null and b/Open-ILS/src/Android/logos/hemlock_tall.png differ