Merge branch 'master' into 'gwt25'

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SortedCellTableWithStylableHeaders.java
This commit is contained in:
D049941 committed 2012-11-22 15:43:03 +01:00
commit c393031c41
2041 files changed
+139420 -115508

No files matched your search

+14 -12
View File
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/TracTracClientModule.jar">
<attributes>
<attribute name="javadoc_location" value="file:/C:/data/SAP/sailing/workspace/java/com.tractrac.clientmodule/javadoc/"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/TracCommon.jar"/>
<classpathentry exported="true" kind="lib" path="lib/TracDataLib.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/TracTracClientModule.jar">
<attributes>
<attribute name="javadoc_location" value="file:/C:/data/SAP/sailing/workspace/java/com.tractrac.clientmodule/javadoc/"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="output" path="bin"/>
</classpath>