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 /node_modules/montage/examples/feed-reader/images | |
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 'node_modules/montage/examples/feed-reader/images')
15 files changed, 0 insertions, 0 deletions
diff --git a/node_modules/montage/examples/feed-reader/images/07-map-marker.png b/node_modules/montage/examples/feed-reader/images/07-map-marker.png deleted file mode 100644 index a5d99d69..00000000 --- a/node_modules/montage/examples/feed-reader/images/07-map-marker.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/10-medical.png b/node_modules/montage/examples/feed-reader/images/10-medical.png deleted file mode 100644 index ab78c783..00000000 --- a/node_modules/montage/examples/feed-reader/images/10-medical.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/100-coffee.png b/node_modules/montage/examples/feed-reader/images/100-coffee.png deleted file mode 100644 index 4e9c517a..00000000 --- a/node_modules/montage/examples/feed-reader/images/100-coffee.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/107-widescreen.png b/node_modules/montage/examples/feed-reader/images/107-widescreen.png deleted file mode 100644 index 2e5f1ba7..00000000 --- a/node_modules/montage/examples/feed-reader/images/107-widescreen.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/125-food.png b/node_modules/montage/examples/feed-reader/images/125-food.png deleted file mode 100644 index 81afd74a..00000000 --- a/node_modules/montage/examples/feed-reader/images/125-food.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/142-wine-bottle.png b/node_modules/montage/examples/feed-reader/images/142-wine-bottle.png deleted file mode 100644 index a7df9e97..00000000 --- a/node_modules/montage/examples/feed-reader/images/142-wine-bottle.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/34-coffee.png b/node_modules/montage/examples/feed-reader/images/34-coffee.png deleted file mode 100644 index 4c4bedad..00000000 --- a/node_modules/montage/examples/feed-reader/images/34-coffee.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/35-shopping.png b/node_modules/montage/examples/feed-reader/images/35-shopping.png deleted file mode 100644 index 03689f99..00000000 --- a/node_modules/montage/examples/feed-reader/images/35-shopping.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/38-airplane.png b/node_modules/montage/examples/feed-reader/images/38-airplane.png deleted file mode 100644 index dfcbbc78..00000000 --- a/node_modules/montage/examples/feed-reader/images/38-airplane.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/41-picture-frame.png b/node_modules/montage/examples/feed-reader/images/41-picture-frame.png deleted file mode 100644 index 6deee997..00000000 --- a/node_modules/montage/examples/feed-reader/images/41-picture-frame.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/47-fuel.png b/node_modules/montage/examples/feed-reader/images/47-fuel.png deleted file mode 100644 index 617d7640..00000000 --- a/node_modules/montage/examples/feed-reader/images/47-fuel.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/48-fork-and-knife.png b/node_modules/montage/examples/feed-reader/images/48-fork-and-knife.png deleted file mode 100644 index 06d91088..00000000 --- a/node_modules/montage/examples/feed-reader/images/48-fork-and-knife.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png deleted file mode 100644 index 51a5f86f..00000000 --- a/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/87-wine-glass.png b/node_modules/montage/examples/feed-reader/images/87-wine-glass.png deleted file mode 100644 index b4d34474..00000000 --- a/node_modules/montage/examples/feed-reader/images/87-wine-glass.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/node_modules/montage/examples/feed-reader/images/88-beer-mug.png b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png deleted file mode 100644 index b0fdd99a..00000000 --- a/node_modules/montage/examples/feed-reader/images/88-beer-mug.png +++ /dev/null | |||
Binary files differ | |||