diff options
| author | Alex Xu <alex_y_xu@yahoo.ca> | 2014-03-07 11:14:53 -0500 |
|---|---|---|
| committer | Alex Xu <alex_y_xu@yahoo.ca> | 2014-03-07 11:14:53 -0500 |
| commit | 3940c408f5fb082425a313a057c12a912f0f9bf5 (patch) | |
| tree | d5b9ba5092bcfbe3c061fa6875aca9127a4f8593 | |
| parent | 5b2a9a221ed74fbf10f229f665d05af3a12184c9 (diff) | |
| parent | cbb002ff60c33d6c4bfcaad42c8df1cfda8f7ea3 (diff) | |
| download | html5ks-3940c408f5fb082425a313a057c12a912f0f9bf5.tar.xz html5ks-3940c408f5fb082425a313a057c12a912f0f9bf5.zip | |
Merge branch 'master' of happinessforme.com:html5ks
Conflicts:
Makefile
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Makefile | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 58a6e04..f04c491 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,3 @@ notifications: irc: channels: - "chat.freenode.net#html5ks" - template: - - "%{repository_name}#%{build_number} of %{commit} on %{branch} by %{author} took %{duration} and ended: %{message}" - - "Compare: %{compare_url}" - - "Build details: %{build_url}" @@ -8,7 +8,8 @@ CWEBP += -quiet -alpha_cleanup -m 6 WEBPMUX ?= webpmux CONVERT ?= convert APNGASM ?= apngasm -NPM ?= npm --quiet +NPM ?= npm +NPM += --quiet JS_COMPRESSOR ?= uglifyjs LOCAL_UGLIFYJS := node_modules/.bin/uglifyjs UGLIFYJS ?= $(LOCAL_UGLIFYJS) |