projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'development' of
[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
b3eec8c
..
46decf5
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;
}
+ @Override
public String toString()
{
return "timestamp: " + timing;