aboutsummaryrefslogtreecommitdiffstats
path: root/grunt.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-08-11 19:45:43 +0200
committerFelix Nagel <info@felixnagel.com>2012-08-11 19:45:43 +0200
commitdd272e75689a7e105f7d852f0fc903e4f4bda245 (patch)
tree5c097bc4ce4ab3ead310c63ac228bb1f0d3683b6 /grunt.js
parent549b97ed6cc718087ce8b9bff3c8556ab4ca7848 (diff)
parent30b579f598a3abdc9b0b7ad18bc76c8b5438d5ca (diff)
downloadjquery-ui-dd272e75689a7e105f7d852f0fc903e4f4bda245.tar.gz
jquery-ui-dd272e75689a7e105f7d852f0fc903e4f4bda245.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'grunt.js')
-rw-r--r--grunt.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/grunt.js b/grunt.js
index a861be2e0..d244e21cc 100644
--- a/grunt.js
+++ b/grunt.js
@@ -114,7 +114,7 @@ function createBanner( files ) {
"<%= grunt.template.today('isoDate') %>\n" +
"<%= pkg.homepage ? '* ' + pkg.homepage + '\n' : '' %>" +
"* Includes: " + (files ? fileNames.join(", ") : "<%= stripDirectory(grunt.task.current.file.src[1]) %>") + "\n" +
- "* Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
+ "* Copyright <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
" Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */";
}
@@ -158,12 +158,12 @@ grunt.initConfig({
dist: {
src: [
"AUTHORS.txt",
- "GPL-LICENSE.txt",
"jquery-*.js",
"MIT-LICENSE.txt",
"README.md",
"grunt.js",
"package.json",
+ "*.jquery.json",
"ui/**/*",
"demos/**/*",
"themes/**/*",
@@ -203,7 +203,6 @@ grunt.initConfig({
cdn: {
src: [
"AUTHORS.txt",
- "GPL-LICENSE.txt",
"MIT-LICENSE.txt",
"ui/*.js",
"package.json"
@@ -246,7 +245,6 @@ grunt.initConfig({
themes: {
src: [
"AUTHORS.txt",
- "GPL-LICENSE.txt",
"MIT-LICENSE.txt",
"package.json"
],