Merge branch 'master' of https://github.com/patniemeyer/j2swift

Conflicts: .gitignore
p1b234 · Apr 9, 2015 · c57dc1d · c57dc1d
2 parents fd4edaf + ad8eefc
commit c57dc1d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ A few things it does
 A few things it could do in the future
 --------------------------------------
 
+- For and While Loops
 - Final vars should become "let" vars.
 - Method and fields with the same name should be disambiguated.
 - Static method invocations should be qualified.

diff --git a/j2swift.sh b/j2swift.sh
@@ -1,2 +1,2 @@
-J2SWIFT=~/Desktop/MebaSwift/j2swift/
+J2SWIFT=~/Desktop/j2swift/
 java -classpath $J2SWIFT/out/production/antlr:$J2SWIFT/lib/antlr-4.5-complete.jar J2Swift $1