Merge branch 'master' of github.com:firebug/firebug

firebug · Apr 4, 2012 · 22b6c5e · 22b6c5e
2 parents a5fc0e4 + a1a1bb8
commit 22b6c5e
Show file tree

Hide file tree

Showing 21 changed files with 1,104 additions and 189 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,25 @@
+
+# Junk that could exist anywhere:
+.DS_Store
+*.swp
+*.tmp
+.*.gz
+
+# Editor junk
+*.project
+/.pydevproject
+/.settings/
+/.settings.xml
+/.settings.xml.old
+/.idea/
+
+# Build Files
+/extension/build/
+/extension/release/
+*.graphml
+
+# Files from NPM
+/extension/node_modules/
+
+# Extensions
+/extension/firebug@software.joehewitt.com