Merge remote branch 'bergie/master' into annotate3

Conflicts: src/widgets/button.coffee
repos-javascript · Mar 28, 2012 · a3e5001 · a3e5001
2 parents 12765cd + a765e4a
commit a3e5001
Show file tree

Hide file tree

Showing 12 changed files with 330 additions and 43 deletions.
diff --git a/examples/hallo-min.js b/examples/hallo-min.js
diff --git a/examples/hallo.css b/examples/hallo.css
@@ -25,7 +25,7 @@ div.hallotoolbar {
     padding: 1px;
 }
 
-.dropdown-target {
+.dropdown-menu {
     width: "200px";
     background-color: #eeeeec;
 }