diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-08 23:59:43 -0500 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-08 23:59:43 -0500 |
commit | 20b2090182dc2a62adcbfb0ff844574e0596756d (patch) | |
tree | d4ab9e8726647014d886172c9421709701d77151 /images | |
parent | 8d19baadffaf38a563a3ad1052180bcb142eb564 (diff) | |
parent | e25fb2b2f9a822fa7180448ddff7f558dfc34fee (diff) | |
download | volse-hubzilla-20b2090182dc2a62adcbfb0ff844574e0596756d.tar.gz volse-hubzilla-20b2090182dc2a62adcbfb0ff844574e0596756d.tar.bz2 volse-hubzilla-20b2090182dc2a62adcbfb0ff844574e0596756d.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
removed info
add info
fixed star-bug
More improved transparency for smilies
removed dolphin file (wtf?)
.
* master:
Diffstat (limited to 'images')
-rw-r--r-- | images/beer_mug.gif | bin | 1032 -> 1021 bytes |
-rwxr-xr-x | images/smiley-Oo.gif | bin | 1045 -> 1003 bytes |
-rwxr-xr-x | images/smiley-brokenheart.gif | bin | 616 -> 598 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/images/beer_mug.gif b/images/beer_mug.gif Binary files differindex a047d1987..9a3e05192 100644 --- a/images/beer_mug.gif +++ b/images/beer_mug.gif diff --git a/images/smiley-Oo.gif b/images/smiley-Oo.gif Binary files differindex a125d0ff2..a15d97427 100755 --- a/images/smiley-Oo.gif +++ b/images/smiley-Oo.gif diff --git a/images/smiley-brokenheart.gif b/images/smiley-brokenheart.gif Binary files differindex 79ca0c31b..971b57fd9 100755 --- a/images/smiley-brokenheart.gif +++ b/images/smiley-brokenheart.gif |