Merge branch 'gui'

physimals · May 4, 2017 · 79bc040 · 79bc040
2 parents 9f6b54f + b507735
commit 79bc040
Show file tree

Hide file tree

Showing 5 changed files with 1,249 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ asl_preproc
 asl_reg
 quasil
 asl_file
+*.pyc
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,4 @@ asl_preproc @@
     asl_reg
     quasil
     asl_file
+    *.pyc