Merge branch 'master' into dev

2015-04-17 01:10:57 +08:00 · 2015-04-17 01:10:57 +08:00 · d178d0bdae
parent 7956b6d309 64942f3c57
commit d178d0bdae
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -2,4 +2,4 @@
 # -*- tab-width:4;indent-tabs-mode:nil -*-
 # ex: ts=4 sw=4 et

-make && make dist && cd rel/emqtt && ./bin/emqtt console
+make && make dist && cd rel/emqttd && ./bin/emqttd console