Merge branch 'stable'

2015-02-19 18:13:28 +01:00 · 2015-02-19 18:13:28 +01:00 · 203e1b52f0
parent dd6112cbfc 5188e56ee3
commit 203e1b52f0
2 changed files with 10 additions and 5 deletions
--- a/deps/rabbitmq_codegen/.gitignore
+++ b/deps/rabbitmq_codegen/.gitignore
@ -1 +1,11 @@
+*~
+.sw?
+.*.sw?
+*.beam
 *.pyc
+erl_crash.dump
+/build/
+/cover/
+/dist/
+/ebin/
+/tmp/
--- a/deps/rabbitmq_codegen/.hgignore
+++ b/deps/rabbitmq_codegen/.hgignore
@ -1,5 +0,0 @@
-syntax: glob
-*.pyc
-*~
-
-syntax: regexp