Merge branch 'development' of github.com:aptana/libraries_com into de…

…velopment
aptana · Aug 1, 2012 · ad05686 · ad05686
2 parents 20ffe38 + 4a32c0e
commit ad05686
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/builders/com.aptana.ide.libraries.subscription.build/build_local.properties b/builders/com.aptana.ide.libraries.subscription.build/build_local.properties
@@ -24,10 +24,14 @@ deploy.dir=/var/update-site/update/${scs.branch.name}/libraries-com
 #cleanAfter=true
 git.executable=/usr/bin/git
 
-# Eclipse 3.7.1
-vanilla.eclipse=/opt/eclipse_3.7.1
+# Eclipse 3.7.2
+vanilla.eclipse=/opt/eclipse_3.7.2
 launcher.plugin=org.eclipse.equinox.launcher_1.2.0.v20110502
-builder.plugin=org.eclipse.pde.build_3.7.0.v20110512-1320
+builder.plugin=org.eclipse.pde.build_3.7.0.v20111116-2009
+# Eclipse 3.7.1
+#vanilla.eclipse=/opt/eclipse_3.7.1
+#launcher.plugin=org.eclipse.equinox.launcher_1.2.0.v20110502
+#builder.plugin=org.eclipse.pde.build_3.7.0.v20110512-1320
 # Eclipse 3.5.2
 #vanilla.eclipse=/opt/eclipse_3.5.2
 #launcher.plugin=org.eclipse.equinox.launcher_1.0.201.R35x_v20090715

diff --git a/builders/com.aptana.ide.libraries.subscription.build/license.html b/builders/com.aptana.ide.libraries.subscription.build/license.html
@@ -32,7 +32,7 @@
 <body>
 
 <p style="font-size:120%;padding:20px 20px 0px 20px;"><i>
-This program Copyright (c) 2005-2011 by Appcelerator, Inc. This program is
+This program Copyright (c) 2005-2012 by Appcelerator, Inc. This program is
 distributed under the GNU General Public license.
 
 This program is free software; you can redistribute

diff --git a/features/com.aptana.ide.feature.libraries.subscription/feature.properties b/features/com.aptana.ide.feature.libraries.subscription/feature.properties
@@ -40,7 +40,7 @@ licenseURL=license.html
 license=\
 GNU GENERAL PUBLIC LICENSE (V3 WITH EXCEPTIONS)\n\
 \n\
-This program Copyright (c) 2005-2011 Appcelerator, Inc. This program is distributed under the GNU General Public license. For the GPL license, this program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, Version 3, as published by the Free Software Foundation. Please review the license below for specific terms and conditions.\n\
+This program Copyright (c) 2005-2012 Appcelerator, Inc. This program is distributed under the GNU General Public license. For the GPL license, this program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, Version 3, as published by the Free Software Foundation. Please review the license below for specific terms and conditions.\n\
 \n\
 Any modifications must keep this entire license intact.\n\
 \n\

diff --git a/features/com.aptana.ide.feature.libraries.subscription/feature.xml b/features/com.aptana.ide.feature.libraries.subscription/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.aptana.ide.feature.libraries.subscription"
       label="%featureName"
-      version="2.0.2.qualifier"
+      version="2.0.3.qualifier"
       provider-name="%providerName">
 
    <description>

diff --git a/features/com.aptana.ide.feature.libraries.subscription/license.html b/features/com.aptana.ide.feature.libraries.subscription/license.html
@@ -32,7 +32,7 @@
 <body>
 
 <p style="font-size:120%;padding:20px 20px 0px 20px;"><i>
-This program Copyright (c) 2005-2011 by Appcelerator, Inc. This program is
+This program Copyright (c) 2005-2012 by Appcelerator, Inc. This program is
 distributed under the GNU General Public license.
 
 This program is free software; you can redistribute

diff --git a/plugins/com.aptana.ide.libraries.subscription/META-INF/MANIFEST.MF b/plugins/com.aptana.ide.libraries.subscription/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.aptana.ide.libraries.subscription
-Bundle-Version: 2.0.2.qualifier
+Bundle-Version: 2.0.3.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin

diff --git a/plugins/com.aptana.ide.libraries.subscription/license.html b/plugins/com.aptana.ide.libraries.subscription/license.html
@@ -32,7 +32,7 @@
 <body>
 
 <p style="font-size:120%;padding:20px 20px 0px 20px;"><i>
-This program Copyright (c) 2005-2011 by Appcelerator, Inc. This program is
+This program Copyright (c) 2005-2012 by Appcelerator, Inc. This program is
 distributed under the GNU General Public license.
 
 This program is free software; you can redistribute