diff options
author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
tree | e778f2b9d5d525aa364360d5996536a0a06379bd /node_modules/montage/examples/feed-reader/images | |
parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
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 new file mode 100644 index 00000000..a5d99d69 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/07-map-marker.png | |||
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 new file mode 100644 index 00000000..ab78c783 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/10-medical.png | |||
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 new file mode 100644 index 00000000..4e9c517a --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/100-coffee.png | |||
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 new file mode 100644 index 00000000..2e5f1ba7 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/107-widescreen.png | |||
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 new file mode 100644 index 00000000..81afd74a --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/125-food.png | |||
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 new file mode 100644 index 00000000..a7df9e97 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/142-wine-bottle.png | |||
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 new file mode 100644 index 00000000..4c4bedad --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/34-coffee.png | |||
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 new file mode 100644 index 00000000..03689f99 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/35-shopping.png | |||
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 new file mode 100644 index 00000000..dfcbbc78 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/38-airplane.png | |||
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 new file mode 100644 index 00000000..6deee997 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/41-picture-frame.png | |||
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 new file mode 100644 index 00000000..617d7640 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/47-fuel.png | |||
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 new file mode 100644 index 00000000..06d91088 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/48-fork-and-knife.png | |||
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 new file mode 100644 index 00000000..51a5f86f --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png | |||
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 new file mode 100644 index 00000000..b4d34474 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/87-wine-glass.png | |||
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 new file mode 100644 index 00000000..b0fdd99a --- /dev/null +++ b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png | |||
Binary files differ | |||