eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 21:30:57 +00:00
Code Activity

Merge remote-tracking branch 'origin/master' into dataMining

Browse Source 
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/NestingCompoundGroupKey.java
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelMultiDimensionalNestingGroupingProcessor.java
This commit is contained in:
Lennart Hensler committed 2014-12-13 14:44:38 +01:00
2 parents 13ada0dd8f e9f5185a83
commit 39ea572283
142 files changed
+5870 -1445
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/NestingCompoundGroupKey.java
+1
View File
@@ -4,6 +4,7 @@ import com.sap.sse.datamining.shared.GroupKey;
public class NestingCompoundGroupKey extends AbstractGroupKey {
private static final long serialVersionUID = -7902450253393172550L;
private GroupKey mainKey;