diff options
author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/popup-manager.reel/popup-manager.html | |
parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/popup-manager.reel/popup-manager.html')
-rwxr-xr-x | js/components/popup-manager.reel/popup-manager.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html index 1ae93e15..399a2115 100755 --- a/js/components/popup-manager.reel/popup-manager.html +++ b/js/components/popup-manager.reel/popup-manager.html | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | <body> | 27 | <body> |
28 | 28 | ||
29 | <section id="popupWindows"></section> | 29 | <section data-montage-id="popupWindows"></section> |
30 | 30 | ||
31 | </body> | 31 | </body> |
32 | 32 | ||