- From: Jean-Guilhem Rouel via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 28 Aug 2009 12:40:15 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/.settings
In directory hutz:/tmp/cvs-serv22368/.settings
Modified Files:
org.eclipse.core.resources.prefs org.eclipse.jdt.core.prefs
Added Files:
org.eclipse.wst.jsdt.ui.superType.container
org.eclipse.wst.common.project.facet.core.xml
org.eclipse.wst.jsdt.ui.superType.name
org.eclipse.wst.common.component .jsdtscope
Log Message:
Merging dev2 in HEAD
Index: org.eclipse.jdt.core.prefs
===================================================================
RCS file: /sources/public/2006/unicorn/.settings/org.eclipse.jdt.core.prefs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- org.eclipse.jdt.core.prefs 31 Aug 2006 09:05:18 -0000 1.1.1.1
+++ org.eclipse.jdt.core.prefs 28 Aug 2009 12:40:13 -0000 1.2
@@ -1,7 +1,12 @@
-#Mon May 22 13:46:28 CEST 2006
+#Wed Aug 05 12:14:02 CEST 2009
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
--- NEW FILE: org.eclipse.wst.jsdt.ui.superType.container ---
org.eclipse.wst.jsdt.launching.baseBrowserLibrary
--- NEW FILE: org.eclipse.wst.common.project.facet.core.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="Apache Tomcat v6.0"/>
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.web" version="2.5"/>
<installed facet="jst.java" version="5.0"/>
</faceted-project>
--- NEW FILE: .jsdtscope ---
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
</classpath>
--- NEW FILE: org.eclipse.wst.common.component ---
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="unicorn_dev">
<wb-resource deploy-path="/" source-path="/WebContent"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<property name="java-output-path"/>
<property name="context-root" value="unicorn_dev"/>
</wb-module>
</project-modules>
--- NEW FILE: org.eclipse.wst.jsdt.ui.superType.name ---
Window
Index: org.eclipse.core.resources.prefs
===================================================================
RCS file: /sources/public/2006/unicorn/.settings/org.eclipse.core.resources.prefs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org.eclipse.core.resources.prefs 31 Jul 2009 11:16:25 -0000 1.2
+++ org.eclipse.core.resources.prefs 28 Aug 2009 12:40:12 -0000 1.3
@@ -1,7 +1,5 @@
-#Thu Jul 30 11:53:38 GMT+02:00 2009
-encoding//resources/templates/language/index.it.properties=UTF-8
+#Wed Aug 19 12:52:14 CEST 2009
eclipse.preferences.version=1
-encoding//resources/templates/language/index.en.properties=UTF-8
-encoding//resources/templates/language/index.fr.properties=UTF-8
-encoding//resources/templates/language/general.fr.properties=UTF-8
-encoding//resources/templates/language/general.en.properties=UTF-8
+encoding//WebContent/WEB-INF/languages/en.properties=UTF-8
+encoding//WebContent/WEB-INF/languages/fr.properties=UTF-8
+encoding/<project>=UTF-8
Received on Friday, 28 August 2009 12:40:55 UTC