Synced common stuff with master.

mauricemach · Sep 22, 2011 · 82b7f6a · 82b7f6a
1 parent 97c7ba2
commit 82b7f6a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+**v0.2.0edge** (unreleased):
+
+  - Changed: using standard jquery from code.jquery.com instead of node-jquery. Updated to 1.6.4.
+  - Changed: updated sammy to 0.7.0.
+  - Fixed #80: Default layout is not being added correctly.
+
 **v0.2.0** (2011-09-08):
 
   - Changed: externals (`zappa {foo} ->`) are available at all scopes, shadow globals and root scope locals.

diff --git a/Cakefile b/Cakefile
@@ -15,7 +15,7 @@ task 'docs', ->
 
 task 'vendor', ->
   run 'mkdir -p vendor && cd vendor && curl -OL http://code.jquery.com/jquery-1.6.4.min.js', ->
-    run 'cd vendor && curl -OL http://raw.github.com/quirkey/sammy/v0.7.0/lib/min/sammy-0.7.0.min.js', ->
+    run 'cd vendor && curl -OL https://raw.github.com/quirkey/sammy/v0.7.0/lib/min/sammy-0.7.0.min.js', ->
       run 'head -n 1 vendor/jquery*', ->
         run 'head -n 3 vendor/sammy*'
 

diff --git a/foo.coffee b/foo.coffee
diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
     "Jae Kwon <jae@flywheelnetworks.com>",
     "Yuya Nishiyama <nsy@ulz.nu>",
     "Esa-Matti Suuronen <esa-matti@suuronen.org>",
+    "Ian Young <ian.greenleaf@gmail.com>",
     "Isaac Wolkerstorfer <agnoster@gmail.com>",
     "Jason King <jk@handle.it>",
     "Stéphane Alnet <stephane@shimaore.net>",