Merge branch 'master' into ipynb-checkpoints

87d87bdc · Manav Mandhani · bc776141 · 92fe2311 · 87d87bdc · 87d87bdc
Commit 87d87bdc authored Aug 04, 2015 by Manav Mandhani
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

Android.gitignore Android.gitignore +3 -0

Dart.gitignore Dart.gitignore +1 -0

KiCAD.gitignore KiCAD.gitignore +2 -0

No files found.
--- 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