aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-23 14:39:01 -0700
committerValerio Virgillito2012-07-23 14:39:01 -0700
commitc25c853fe991d4bdf3cf0b5945c574bbfd5fc597 (patch)
tree753dd7720914796e0fea5e078730ca98ff5b6779 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
parentbcb5aa3d1c5024e968c266be18128d8ea0988757 (diff)
parente7268388a99722dd7bb64506893538fd0ee96a71 (diff)
downloadninja-c25c853fe991d4bdf3cf0b5945c574bbfd5fc597.tar.gz
Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 0d769c23..8a4073c9 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.