diff options
| author | tim b <timb@camcompu.home> | 2010-04-07 18:59:50 -0700 |
|---|---|---|
| committer | tim b <timb@camcompu.home> | 2010-04-07 18:59:50 -0700 |
| commit | 6440348618ade4fbcb541c40473074833a47d198 (patch) | |
| tree | 537ab7e4f0af7deba51bbfb360fe490968d651f8 /static/img/share | |
| parent | 4f09c8a882e8ae2ad1c7944a8c2a5939c9c9f7ad (diff) | |
| parent | 42df4633bb7588e8632e45013880ee4fc2bc3d6c (diff) | |
fixing merge conflicts
Diffstat (limited to 'static/img/share')
| -rw-r--r-- | static/img/share/delishicon.png | bin | 0 -> 136 bytes |
| -rw-r--r-- | static/img/share/fbbutton.png | bin | 0 -> 607 bytes |
| -rw-r--r-- | static/img/share/fbicon.gif | bin | 0 -> 130 bytes |
| -rw-r--r-- | static/img/share/tumblricon.gif | bin | 0 -> 567 bytes |
| -rw-r--r-- | static/img/share/tumblricon.png | bin | 0 -> 503 bytes |
| -rw-r--r-- | static/img/share/twittericon.gif | bin | 0 -> 104 bytes |
| -rw-r--r-- | static/img/share/twittericon.png | bin | 0 -> 659 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/static/img/share/delishicon.png b/static/img/share/delishicon.png Binary files differnew file mode 100644 index 0000000..3d20478 --- /dev/null +++ b/static/img/share/delishicon.png diff --git a/static/img/share/fbbutton.png b/static/img/share/fbbutton.png Binary files differnew file mode 100644 index 0000000..4ad2d66 --- /dev/null +++ b/static/img/share/fbbutton.png diff --git a/static/img/share/fbicon.gif b/static/img/share/fbicon.gif Binary files differnew file mode 100644 index 0000000..f13b2bf --- /dev/null +++ b/static/img/share/fbicon.gif diff --git a/static/img/share/tumblricon.gif b/static/img/share/tumblricon.gif Binary files differnew file mode 100644 index 0000000..40e2b35 --- /dev/null +++ b/static/img/share/tumblricon.gif diff --git a/static/img/share/tumblricon.png b/static/img/share/tumblricon.png Binary files differnew file mode 100644 index 0000000..61a8910 --- /dev/null +++ b/static/img/share/tumblricon.png diff --git a/static/img/share/twittericon.gif b/static/img/share/twittericon.gif Binary files differnew file mode 100644 index 0000000..c6902f6 --- /dev/null +++ b/static/img/share/twittericon.gif diff --git a/static/img/share/twittericon.png b/static/img/share/twittericon.png Binary files differnew file mode 100644 index 0000000..662c731 --- /dev/null +++ b/static/img/share/twittericon.png |
