Merge branch 'stable'

2015-02-19 18:13:21 +01:00 · 2015-02-19 18:13:21 +01:00 · 5846edcddd
parent 89b0eed458 1a75abb13c
commit 5846edcddd
2 changed files with 10 additions and 7 deletions
--- a/deps/rabbitmq_web_stomp_examples/.gitignore
+++ b/deps/rabbitmq_web_stomp_examples/.gitignore
@ -0,0 +1,10 @@
+*~
+.sw?
+.*.sw?
+*.beam
+erl_crash.dump
+/build/
+/cover/
+/dist/
+/ebin/
+/tmp/
--- a/deps/rabbitmq_web_stomp_examples/.hgignore
+++ b/deps/rabbitmq_web_stomp_examples/.hgignore
@ -1,7 +0,0 @@
-~$
-\.beam$
-^build/
-^dist/
-^cover/
-^erl_crash.dump$
-^ebin/rabbitmq_web_stomp_examples.app$