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 | |
| parent | 4f09c8a882e8ae2ad1c7944a8c2a5939c9c9f7ad (diff) | |
| parent | 42df4633bb7588e8632e45013880ee4fc2bc3d6c (diff) | |
fixing merge conflicts
Diffstat (limited to 'static/img')
34 files changed, 0 insertions, 0 deletions
diff --git a/static/img/BubbleBlueL800x1600.png b/static/img/BubbleBlueL800x1600.png Binary files differnew file mode 100755 index 0000000..3329e11 --- /dev/null +++ b/static/img/BubbleBlueL800x1600.png diff --git a/static/img/BubbleBlueR800x1600.png b/static/img/BubbleBlueR800x1600.png Binary files differnew file mode 100755 index 0000000..320a743 --- /dev/null +++ b/static/img/BubbleBlueR800x1600.png diff --git a/static/img/BubbleLtGreyL800x1600.png b/static/img/BubbleLtGreyL800x1600.png Binary files differnew file mode 100755 index 0000000..d0728da --- /dev/null +++ b/static/img/BubbleLtGreyL800x1600.png diff --git a/static/img/BubbleLtGreyR800x1600.png b/static/img/BubbleLtGreyR800x1600.png Binary files differnew file mode 100755 index 0000000..5c8abad --- /dev/null +++ b/static/img/BubbleLtGreyR800x1600.png diff --git a/static/img/BubblePinkL800x1600.png b/static/img/BubblePinkL800x1600.png Binary files differnew file mode 100755 index 0000000..a2e3ccb --- /dev/null +++ b/static/img/BubblePinkL800x1600.png diff --git a/static/img/BubblePinkR800x1600.png b/static/img/BubblePinkR800x1600.png Binary files differnew file mode 100755 index 0000000..97c59fb --- /dev/null +++ b/static/img/BubblePinkR800x1600.png diff --git a/static/img/Picsearch.gif b/static/img/Picsearch.gif Binary files differnew file mode 100644 index 0000000..292e47e --- /dev/null +++ b/static/img/Picsearch.gif diff --git a/static/img/bag_of_money_hg_wht.gif b/static/img/bag_of_money_hg_wht.gif Binary files differnew file mode 100644 index 0000000..4b82d4e --- /dev/null +++ b/static/img/bag_of_money_hg_wht.gif diff --git a/static/img/buttonbottom.gif b/static/img/buttonbottom.gif Binary files differnew file mode 100644 index 0000000..158c641 --- /dev/null +++ b/static/img/buttonbottom.gif diff --git a/static/img/buttontop.gif b/static/img/buttontop.gif Binary files differnew file mode 100644 index 0000000..b4540cd --- /dev/null +++ b/static/img/buttontop.gif diff --git a/static/img/copydump.png b/static/img/copydump.png Binary files differnew file mode 100644 index 0000000..b44aba2 --- /dev/null +++ b/static/img/copydump.png diff --git a/static/img/editprofile.png b/static/img/editprofile.png Binary files differnew file mode 100644 index 0000000..f1233f0 --- /dev/null +++ b/static/img/editprofile.png diff --git a/static/img/facebooklol.jpeg b/static/img/facebooklol.jpeg Binary files differnew file mode 100644 index 0000000..5da3d43 --- /dev/null +++ b/static/img/facebooklol.jpeg diff --git a/static/img/footer.png b/static/img/footer.png Binary files differnew file mode 100755 index 0000000..d83aafd --- /dev/null +++ b/static/img/footer.png diff --git a/static/img/fundump.png b/static/img/fundump.png Binary files differnew file mode 100644 index 0000000..e5db562 --- /dev/null +++ b/static/img/fundump.png diff --git a/static/img/gagaq.png b/static/img/gagaq.png Binary files differnew file mode 100644 index 0000000..b6f8f60 --- /dev/null +++ b/static/img/gagaq.png diff --git a/static/img/idontgetit.png b/static/img/idontgetit.png Binary files differnew file mode 100644 index 0000000..f5cda6e --- /dev/null +++ b/static/img/idontgetit.png diff --git a/static/img/ieburnbtn.gif b/static/img/ieburnbtn.gif Binary files differnew file mode 100644 index 0000000..266ccd2 --- /dev/null +++ b/static/img/ieburnbtn.gif diff --git a/static/img/imagesearchhelp.png b/static/img/imagesearchhelp.png Binary files differnew file mode 100644 index 0000000..09f590b --- /dev/null +++ b/static/img/imagesearchhelp.png diff --git a/static/img/leftarrow.png b/static/img/leftarrow.png Binary files differnew file mode 100644 index 0000000..e432ded --- /dev/null +++ b/static/img/leftarrow.png diff --git a/static/img/myspacehelp.png b/static/img/myspacehelp.png Binary files differnew file mode 100644 index 0000000..6b18789 --- /dev/null +++ b/static/img/myspacehelp.png diff --git a/static/img/myspacehelp2.png b/static/img/myspacehelp2.png Binary files differnew file mode 100644 index 0000000..a32250c --- /dev/null +++ b/static/img/myspacehelp2.png 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 diff --git a/static/img/sitesearchhelp.png b/static/img/sitesearchhelp.png Binary files differnew file mode 100644 index 0000000..c6f810e --- /dev/null +++ b/static/img/sitesearchhelp.png diff --git a/static/img/thumbs_up_sm.gif b/static/img/thumbs_up_sm.gif Binary files differdeleted file mode 100644 index b039245..0000000 --- a/static/img/thumbs_up_sm.gif +++ /dev/null diff --git a/static/img/trophyicon.gif b/static/img/trophyicon.gif Binary files differnew file mode 100644 index 0000000..faf68ef --- /dev/null +++ b/static/img/trophyicon.gif diff --git a/static/img/uploadbuttonhelp.png b/static/img/uploadbuttonhelp.png Binary files differnew file mode 100644 index 0000000..ffc8ebe --- /dev/null +++ b/static/img/uploadbuttonhelp.png diff --git a/static/img/webcambuttonhelp.png b/static/img/webcambuttonhelp.png Binary files differnew file mode 100644 index 0000000..5d98228 --- /dev/null +++ b/static/img/webcambuttonhelp.png |
