[eclipse-jbosstools] Rebase failing hunk in freemarker-4.0.0.patch
Gerard Ryan
galileo at fedoraproject.org
Fri Jan 18 19:11:55 UTC 2013
commit 0055a8989bf2bebe2aac675bab068f742a2f3cdc
Author: Gerard Ryan <gerard at ryan.lt>
Date: Thu Jan 17 17:01:05 2013 +0000
Rebase failing hunk in freemarker-4.0.0.patch
eclipse-jbosstools-freemarker-4.0.0.patch | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/eclipse-jbosstools-freemarker-4.0.0.patch b/eclipse-jbosstools-freemarker-4.0.0.patch
index 6ef7c17..035ea69 100644
--- a/eclipse-jbosstools-freemarker-4.0.0.patch
+++ b/eclipse-jbosstools-freemarker-4.0.0.patch
@@ -26,14 +26,14 @@
+ freemarker.jar
source.freemarker-ide.jar = src/
output.freemarker-ide.jar = bin/
---- freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF.orig 2012-07-22 14:27:14.930362365 +0100
-+++ freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF 2012-07-22 14:27:33.120015436 +0100
+--- freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF.orig 2013-01-17 16:52:33.267230513 +0000
++++ freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF 2013-01-17 16:52:48.942938109 +0000
@@ -22,7 +22,7 @@
- org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
- Bundle-ActivationPolicy: lazy
- Bundle-ClassPath: freemarker-ide.jar,
-- freemarker-2.3.18.jar
-+ freemarker.jar
- Bundle-Vendor: %providerName
- Export-Package: freemarker.core,
- freemarker.template,
+ org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
+ Bundle-ActivationPolicy: lazy
+ Bundle-ClassPath: freemarker-ide.jar,
+- freemarker-2.3.18.jar
++ freemarker.jar
+ Bundle-Vendor: %providerName
+ Export-Package: freemarker.core,
+ freemarker.template,
More information about the scm-commits
mailing list