diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 19:06:02 -0500 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 19:06:02 -0500 |
commit | d89cd6569bac3d157870b478b41f72c8958ea382 (patch) | |
tree | 9bb9f515c571d361b9e16f6ef6a308f4ffac5ed2 | |
parent | c4c98a998827fb0ec49d5b40d3e4439aa9146e24 (diff) | |
parent | fdd269228b159709f5d0f3cf9bb7a23d2c046255 (diff) | |
download | volse-hubzilla-d89cd6569bac3d157870b478b41f72c8958ea382.tar.gz volse-hubzilla-d89cd6569bac3d157870b478b41f72c8958ea382.tar.bz2 volse-hubzilla-d89cd6569bac3d157870b478b41f72c8958ea382.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
improved smiley transparency
* master:
-rw-r--r-- | images/smiley-beard.png | bin | 1021 -> 1094 bytes |
-rwxr-xr-x | images/smiley-cool.gif | bin | 354 -> 315 bytes |
-rwxr-xr-x | images/smiley-cry.gif | bin | 329 -> 303 bytes |
-rwxr-xr-x | images/smiley-embarassed.gif | bin | 331 -> 300 bytes |
-rwxr-xr-x | images/smiley-foot-in-mouth.gif | bin | 344 -> 306 bytes |
-rwxr-xr-x | images/smiley-frown.gif | bin | 340 -> 301 bytes |
-rwxr-xr-x | images/smiley-heart.gif | bin | 592 -> 577 bytes |
-rwxr-xr-x | images/smiley-innocent.gif | bin | 336 -> 305 bytes |
-rwxr-xr-x | images/smiley-kiss.gif | bin | 338 -> 299 bytes |
-rwxr-xr-x | images/smiley-laughing.gif | bin | 344 -> 306 bytes |
-rwxr-xr-x | images/smiley-money-mouth.gif | bin | 321 -> 291 bytes |
-rwxr-xr-x | images/smiley-sealed.gif | bin | 325 -> 293 bytes |
-rwxr-xr-x | images/smiley-smile.gif | bin | 345 -> 306 bytes |
-rwxr-xr-x | images/smiley-surprised.gif | bin | 342 -> 303 bytes |
-rwxr-xr-x | images/smiley-tongue-out.gif | bin | 328 -> 290 bytes |
-rwxr-xr-x | images/smiley-undecided.gif | bin | 337 -> 299 bytes |
-rwxr-xr-x | images/smiley-wink.gif | bin | 351 -> 312 bytes |
-rwxr-xr-x | images/smiley-yell.gif | bin | 336 -> 298 bytes |
18 files changed, 0 insertions, 0 deletions
diff --git a/images/smiley-beard.png b/images/smiley-beard.png Binary files differindex 14c81414f..5d4b28463 100644 --- a/images/smiley-beard.png +++ b/images/smiley-beard.png diff --git a/images/smiley-cool.gif b/images/smiley-cool.gif Binary files differindex ba90cc36f..cee1c1aa3 100755 --- a/images/smiley-cool.gif +++ b/images/smiley-cool.gif diff --git a/images/smiley-cry.gif b/images/smiley-cry.gif Binary files differindex 74d897a4f..06e6ca2c2 100755 --- a/images/smiley-cry.gif +++ b/images/smiley-cry.gif diff --git a/images/smiley-embarassed.gif b/images/smiley-embarassed.gif Binary files differindex 963a96b8a..adc12e7c5 100755 --- a/images/smiley-embarassed.gif +++ b/images/smiley-embarassed.gif diff --git a/images/smiley-foot-in-mouth.gif b/images/smiley-foot-in-mouth.gif Binary files differindex 16f68cc1e..b444e5781 100755 --- a/images/smiley-foot-in-mouth.gif +++ b/images/smiley-foot-in-mouth.gif diff --git a/images/smiley-frown.gif b/images/smiley-frown.gif Binary files differindex 716f55e16..9ff19850d 100755 --- a/images/smiley-frown.gif +++ b/images/smiley-frown.gif diff --git a/images/smiley-heart.gif b/images/smiley-heart.gif Binary files differindex 21c0c6530..6a11e7065 100755 --- a/images/smiley-heart.gif +++ b/images/smiley-heart.gif diff --git a/images/smiley-innocent.gif b/images/smiley-innocent.gif Binary files differindex 334d49e0e..9d747140e 100755 --- a/images/smiley-innocent.gif +++ b/images/smiley-innocent.gif diff --git a/images/smiley-kiss.gif b/images/smiley-kiss.gif Binary files differindex 4efd549ed..cc356611e 100755 --- a/images/smiley-kiss.gif +++ b/images/smiley-kiss.gif diff --git a/images/smiley-laughing.gif b/images/smiley-laughing.gif Binary files differindex 1606c119e..1bf29de79 100755 --- a/images/smiley-laughing.gif +++ b/images/smiley-laughing.gif diff --git a/images/smiley-money-mouth.gif b/images/smiley-money-mouth.gif Binary files differindex ca2451e10..1e8ccd0f3 100755 --- a/images/smiley-money-mouth.gif +++ b/images/smiley-money-mouth.gif diff --git a/images/smiley-sealed.gif b/images/smiley-sealed.gif Binary files differindex b33d3cca1..98186742d 100755 --- a/images/smiley-sealed.gif +++ b/images/smiley-sealed.gif diff --git a/images/smiley-smile.gif b/images/smiley-smile.gif Binary files differindex e6a9e60d5..b9bff40a4 100755 --- a/images/smiley-smile.gif +++ b/images/smiley-smile.gif diff --git a/images/smiley-surprised.gif b/images/smiley-surprised.gif Binary files differindex cb99cdd91..b07465326 100755 --- a/images/smiley-surprised.gif +++ b/images/smiley-surprised.gif diff --git a/images/smiley-tongue-out.gif b/images/smiley-tongue-out.gif Binary files differindex 2075dc160..48867dc26 100755 --- a/images/smiley-tongue-out.gif +++ b/images/smiley-tongue-out.gif diff --git a/images/smiley-undecided.gif b/images/smiley-undecided.gif Binary files differindex bef7e2573..28029794f 100755 --- a/images/smiley-undecided.gif +++ b/images/smiley-undecided.gif diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif Binary files differindex 9faf1aff8..e1cefb05c 100755 --- a/images/smiley-wink.gif +++ b/images/smiley-wink.gif diff --git a/images/smiley-yell.gif b/images/smiley-yell.gif Binary files differindex 648e6e879..5296c8836 100755 --- a/images/smiley-yell.gif +++ b/images/smiley-yell.gif |