[sword-svn] r3595 - in trunk: bindings/Android/SWORD/.idea scripts

[scribe at crosswire.org]

Author: scribe
Date: 2018-09-10 06:20:58 -0700 (Mon, 10 Sep 2018)
New Revision: 3595

Modified:
   trunk/bindings/Android/SWORD/.idea/misc.xml
   trunk/scripts/merge
Log:
minor straggler changes which need commit

Modified: trunk/bindings/Android/SWORD/.idea/misc.xml
===================================================================
--- trunk/bindings/Android/SWORD/.idea/misc.xml	2018-09-10 13:19:37 UTC (rev 3594)
+++ trunk/bindings/Android/SWORD/.idea/misc.xml	2018-09-10 13:20:58 UTC (rev 3595)
@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

Modified: trunk/scripts/merge
===================================================================
--- trunk/scripts/merge	2018-09-10 13:19:37 UTC (rev 3594)
+++ trunk/scripts/merge	2018-09-10 13:20:58 UTC (rev 3595)
@@ -6,4 +6,5 @@
     exit 1
 }
 
+# -r start:to does not include start (stupid? reason?)
 svn merge -c $1 ^/trunk