diff options
| author | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
| commit | 5496f0060c5f43e7951a110241a18b9e631761bb (patch) | |
| tree | bd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/stage/binding-view.reel/binding-hud.reel/binding-hud.html | |
| parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
| parent | ec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff) | |
| download | ninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/stage/binding-view.reel/binding-hud.reel/binding-hud.html')
| -rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html index 7bb888d5..f7e1a1d2 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html | |||
| @@ -36,7 +36,8 @@ | |||
| 36 | "element": {"#" : "hudOption"} | 36 | "element": {"#" : "hudOption"} |
| 37 | }, | 37 | }, |
| 38 | "bindings": { | 38 | "bindings": { |
| 39 | "title": {"<-": "@repeater.objectAtCurrentIteration"} | 39 | "title": {"<-": "@repeater.objectAtCurrentIteration.property"}, |
| 40 | "promoted": {"<-": "@repeater.objectAtCurrentIteration.promoted"} | ||
| 40 | } | 41 | } |
| 41 | }, | 42 | }, |
| 42 | "resizer1": { | 43 | "resizer1": { |