Merge pull request #98 from trusktr/trusktr-famous

Update famous. Adde override to my form of famous.
This commit is contained in:
Guy Bedford
2015-01-07 10:55:43 +02:00
2 changed files with 2 additions and 3 deletions
@@ -3,12 +3,11 @@
"lib": "src" "lib": "src"
}, },
"dependencies": { "dependencies": {
"famous-polyfills": "^0.3.0",
"css": "^0.1.0" "css": "^0.1.0"
}, },
"shim": { "shim": {
"*/*": { "*/*": {
"deps": ["famous-polyfills", "../core/famous.css!"] "deps": ["../core/famous.css!"]
} }
} }
} }
+1 -1
View File
@@ -145,7 +145,7 @@
"timers": "github:jspm/nodelibs-timers", "timers": "github:jspm/nodelibs-timers",
"tinygrowl": "github:ajkochanowicz/tinygrowl", "tinygrowl": "github:ajkochanowicz/tinygrowl",
"tls": "github:jspm/nodelibs-tls", "tls": "github:jspm/nodelibs-tls",
"trusktr-famous": "github:trusktr/famous", "trusktr-famous": "github:trusktr/famous@jspm",
"tty": "github:jspm/nodelibs-tty", "tty": "github:jspm/nodelibs-tty",
"typeahead": "github:twitter/typeahead.js", "typeahead": "github:twitter/typeahead.js",
"ua-parser-js": "npm:ua-parser-js", "ua-parser-js": "npm:ua-parser-js",