reconcile with upstream

Author: 0-8-15

.gitignore

@@ -10,6 +10,8 @@ tmp.*
 *.class
 *.jar
 *.o2
+*.class
+#*.jar
 *.a
 *.old*
 *.bak*

VERSION

@@ -10,4 +10,9 @@
 # 1.0.8: iOS refactoring, new modules, localnotifications, various fixes
 # 1.0.9: framework7 web-app support, core module performance improvement
 # 1.0.10: iOS refactoring, clipboard support, uiform widget tweaks
+# 1.0.11: iOS updates, redcap updates, linux loader updates, bug fixes
+# 1.0.12: Gambit 4.9.2 support, library updates, android build improvements
+# 1.0.13: arm64 android, macOS codesigning, IPv6, OpenGL bugfixes
+# 1.1: android multiple api support, major ln_glgui renderloop timing change
+# 1.1.1: Bug fixes, better android support, ln_jScheme module
 1.0.10

modules/ln_jscheme/ANDROID_java_activityadditions

@@ -159,3 +159,4 @@ public String LNjSchemeResult() {
     return buf.toString();
   }
 }
+// eof: LNjScheme

modules/ln_jscheme/ANDROID_java_additions

@@ -13,3 +13,4 @@ class LNMethod extends LNjScheme.Procedure {
     return null; // return interpreter.eval(body, new Environment(parms, args, env));
   }
 }
+// eof: LNjScheme

modules/ln_jscheme/ANDROID_java_oncreate

@@ -127,5 +127,4 @@ LNjSchemeEvaluateNoSync
     (LNjScheme.Scheme.sym("ln-mglview"),
      mGLView
      )));
-
 // eof: LNjScheme

modules/ln_jscheme/Makefile

@@ -1,4 +1,3 @@
-
 NAME=LNjScheme
 
 android_jars/$(NAME).jar: $(NAME)/*.java

modules/webview/ANDROID_java_additions

@@ -12,10 +12,11 @@ class SchemeWebView extends android.webkit.WebView {
     return interpreter.eval(LNjScheme.Scheme.cons(fn, LNjScheme.Scheme.cons(arg1, args)));
   }
 
-  private Object iapply(Object fn, Object arg1) { return iapply(fn, arg1, null); }
+  private Object iapply(Object fn, Object arg1) {
+    return iapply(fn, arg1, null);
+  }
 
   class SchemeWebViewClient extends android.webkit.WebViewClient {
-
     public Object onloadresource = null;
     public Object onpagefinished = null;
     public Object onpagecomplete = null;