releng: Add 2.1.0 baseline and fix API errors

[deliverable/tracecompass.git] / analysis / org.eclipse.tracecompass.analysis.timing.core / src / org / eclipse / tracecompass / analysis / timing / core / segmentstore / statistics / SegmentStoreStatistics.java

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java b/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java
index 8b80610b995a66d660bd8ac4102e732d21c6968a..23ce5f65f986db349d9273eb6ba15fa7c19c435d 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java
@@ -154,7 +154,7 @@ public class SegmentStoreStatistics {
      *
      * @param other
      *            The other segment store statistics
-     * @since 1.1
+     * @since 1.2
      */
     public void merge(SegmentStoreStatistics other) {
         if (other.fNbSegments == 0) {