Merge branch 'master' into lttng-kepler

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng2.kernel.core / src / org / eclipse / linuxtools / internal / lttng2 / kernel / core / Attributes.java

diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Attributes.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Attributes.java
index 2867c22b569ff17de7794623caf3202b41a22e67..d02918608aafd2572ed7b42f3b0cd02879926ac3 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Attributes.java
+++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Attributes.java
@@ -34,11 +34,11 @@ public abstract class Attributes {
 
     /* Sub-attributes of the CPU nodes */
     public static final String CURRENT_THREAD = "Current_thread";
-    public static final String STATUS = "Status";\r
+    public static final String STATUS = "Status";
 
     /* Sub-attributes of the Thread nodes */
     public static final String PPID = "PPID";
-    //public static final String STATUS = "Status"\r
+    //public static final String STATUS = "Status"
     public static final String EXEC_NAME = "Exec_name";
     public static final String SYSTEM_CALL = "System_call";