java2script
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎
3.77 MB b/‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎
3.77 MB
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎
Lines changed: 1 addition & 5 deletions b/‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip‎
3.77 MB b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip‎
3.77 MB
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp‎
Lines changed: 1 addition & 5 deletions b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎sources/net.sf.j2s.java.core/build_core_applet.xml‎
Lines changed: 0 additions & 1 deletion b/‎sources/net.sf.j2s.java.core/build_core_applet.xml‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
3.77 MB b/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
3.77 MB
@@ -1,5 +1 @@
-<<<<<<< Upstream, based on branch 'yadav1' of https://github.com/BobHanson/java2script.git
-20180827111114 
-=======
-20180827113308 
->>>>>>> 7e507a2 refactoring mouse events and tooltip
+20180827160909 
@@ -1,5 +1 @@
-<<<<<<< Upstream, based on branch 'yadav1' of https://github.com/BobHanson/java2script.git
-20180827111114 
-=======
-20180827113308 
->>>>>>> 7e507a2 refactoring mouse events and tooltip
+20180827160909 
@@ -125,7 +125,6 @@
     	java/util/Hashtable.js
     	java/util/IdentityHashMap.js
     	java/util/Locale.js
-    	java/util/MapEntry.js
     	javajs/api/JSFunction.js
     	javajs/util/AjaxURLConnection.js
     	javajs/util/AjaxURLStreamHandlerFactory.js