Merge branch 'master' of github.com:grails/grails-core

grails · Oct 10, 2012 · a2f23ad · a2f23ad
2 parents 5f2aff9 + 6f982b5
commit a2f23ad
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 179 deletions.
diff --git a/LICENSE b/LICENSE
@@ -208,7 +208,7 @@ Grails 2.2.0 includes a number of subcomponents with
 separate copyright notices and license terms.  The product that 
 includes this file does not necessarily use all the open source 
 subcomponents referred to below. Your use of the source
-code for the these subcomponents is subject to the terms and
+code for these subcomponents is subject to the terms and
 conditions of the following licenses. 
 
 

diff --git a/dependencies.txt b/dependencies.txt
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
@@ -187,7 +187,7 @@ task zipDist(type: Zip, dependsOn: [sourcesJars, install]) {
 
     into("grails-$grailsVersion") {
         from(projectDir) {
-            include 'lib/', 'gradle/', 'media/', 'samples/', 'scripts/', 'build.gradle', 'build.properties', 'dependencies.txt',
+            include 'lib/', 'gradle/', 'media/', 'samples/', 'scripts/', 'build.gradle', 'build.properties',
                     'LICENSE', 'INSTALL', "src/", "gradlew.bat","gradle.properties"
             exclude 'ant/bin', 'src/grails', 'src/war'
         }