Merge branch 'master' into ipynb-checkpoints

2015-08-04 18:53:03 -04:00 · 2015-08-04 18:53:03 -04:00 · 87d87bdcf5
commit 87d87bdcf5
parent bc77614162 92fe23112d
3 changed files with 6 additions and 0 deletions
--- a/Android.gitignore
+++ b/Android.gitignore
@ -24,3 +24,6 @@ proguard/

 # Log Files
 *.log
+
+# Android Studio Navigation editor temp files
+.navigation/
--- a/Dart.gitignore
+++ b/Dart.gitignore
@ -3,6 +3,7 @@
 .pub/
 build/
 packages
+.packages

 # Or the files created by dart2js.
 *.dart.js
--- a/KiCAD.gitignore
+++ b/KiCAD.gitignore
@ -3,6 +3,8 @@
 # Temporary files
 *.000
 *.bak
+*.bck
+*.kicad_pcb-bak

 # Netlist files (exported from Eeschema)
 *.net