Merge branch 'master' into ipynb-checkpoints

manavm · manavm · commit 87d87bdcf5e2 · 2015-08-04T18:53:03.000-04:00
diff --git a/Android.gitignore b/Android.gitignore
@@ -24,3 +24,6 @@ proguard/
 
 # Log Files
 *.log
+
+# Android Studio Navigation editor temp files
+.navigation/
diff --git a/Dart.gitignore b/Dart.gitignore
@@ -3,6 +3,7 @@
 .pub/
 build/
 packages
+.packages
 
 # Or the files created by dart2js.
 *.dart.js
diff --git a/KiCAD.gitignore b/KiCAD.gitignore
@@ -3,6 +3,8 @@
 # Temporary files
 *.000
 *.bak
+*.bck
+*.kicad_pcb-bak
 
 # Netlist files (exported from Eeschema)
 *.net
