merge

esl · Oct 16, 2009 · ca0d709 · ca0d709
2 parents 36dd6a1 + 2b11ddf
commit ca0d709
Show file tree

Hide file tree

Showing 57 changed files with 149 additions and 6,890 deletions.
diff --git a/.hgtags b/.hgtags
@@ -1,2 +1,3 @@
 d93c728f66523b2eb7b58299130d26d7698caea3 1.3rc1
 f9787411670df615ca8df2e215a6154a59c7331d 1.3
+de04dc1e7d2198917d7be1c6ca3b0281cc30f4f2 1.4rc1
diff --git a/lib/mochiweb-0.01/LICENSE b/lib/mochiweb-0.01/LICENSE
diff --git a/lib/mochiweb-0.01/Makefile b/lib/mochiweb-0.01/Makefile
diff --git a/lib/mochiweb-0.01/README b/lib/mochiweb-0.01/README
diff --git a/lib/mochiweb-0.01/ebin/mochiweb.app b/lib/mochiweb-0.01/ebin/mochiweb.app
diff --git a/lib/mochiweb-0.01/priv/skel/Makefile b/lib/mochiweb-0.01/priv/skel/Makefile
diff --git a/lib/mochiweb-0.01/priv/skel/priv/www/index.html b/lib/mochiweb-0.01/priv/skel/priv/www/index.html
diff --git a/lib/mochiweb-0.01/priv/skel/src/Makefile b/lib/mochiweb-0.01/priv/skel/src/Makefile
diff --git a/lib/mochiweb-0.01/priv/skel/src/skel.app b/lib/mochiweb-0.01/priv/skel/src/skel.app
diff --git a/lib/mochiweb-0.01/priv/skel/src/skel.erl b/lib/mochiweb-0.01/priv/skel/src/skel.erl
diff --git a/lib/mochiweb-0.01/priv/skel/src/skel.hrl b/lib/mochiweb-0.01/priv/skel/src/skel.hrl
diff --git a/lib/mochiweb-0.01/priv/skel/src/skel_app.erl b/lib/mochiweb-0.01/priv/skel/src/skel_app.erl
diff --git a/lib/mochiweb-0.01/priv/skel/src/skel_deps.erl b/lib/mochiweb-0.01/priv/skel/src/skel_deps.erl
diff --git a/lib/mochiweb-0.01/priv/skel/src/skel_sup.erl b/lib/mochiweb-0.01/priv/skel/src/skel_sup.erl
diff --git a/lib/mochiweb-0.01/priv/skel/src/skel_web.erl b/lib/mochiweb-0.01/priv/skel/src/skel_web.erl
diff --git a/lib/mochiweb-0.01/priv/skel/start-dev.sh b/lib/mochiweb-0.01/priv/skel/start-dev.sh
diff --git a/lib/mochiweb-0.01/priv/skel/start.sh b/lib/mochiweb-0.01/priv/skel/start.sh
diff --git a/lib/mochiweb-0.01/priv/skel/support/include.mk b/lib/mochiweb-0.01/priv/skel/support/include.mk