projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge logic of origin into logic
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
timeline
/
TimelineEvent.java
diff --git
a/era.mi/src/era/mi/logic/timeline/TimelineEvent.java
b/era.mi/src/era/mi/logic/timeline/TimelineEvent.java
index
26799a3
..
cc37c99
100644
(file)
--- a/
era.mi/src/era/mi/logic/timeline/TimelineEvent.java
+++ b/
era.mi/src/era/mi/logic/timeline/TimelineEvent.java
@@
-22,6
+22,7
@@
public class TimelineEvent
return timing;
\r
}
\r
\r
return timing;
\r
}
\r
\r
+ @Override
\r
public String toString()
\r
{
\r
return "timestamp: " + timing;
\r
public String toString()
\r
{
\r
return "timestamp: " + timing;
\r