Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: improved smiley transparency * master:
2012-03-06 19:06:02 -05:00 · 2012-03-06 19:06:02 -05:00 · d89cd6569b
parent c4c98a9988 fdd269228b
commit d89cd6569b
18 changed files with 0 additions and 0 deletions
--- a/images/smiley-beard.png
+++ b/images/smiley-beard.png
--- a/images/smiley-cool.gif
+++ b/images/smiley-cool.gif
--- a/images/smiley-cry.gif
+++ b/images/smiley-cry.gif
--- a/images/smiley-embarassed.gif
+++ b/images/smiley-embarassed.gif
--- a/images/smiley-foot-in-mouth.gif
+++ b/images/smiley-foot-in-mouth.gif
--- a/images/smiley-frown.gif
+++ b/images/smiley-frown.gif
--- a/images/smiley-heart.gif
+++ b/images/smiley-heart.gif
--- a/images/smiley-innocent.gif
+++ b/images/smiley-innocent.gif
--- a/images/smiley-kiss.gif
+++ b/images/smiley-kiss.gif
--- a/images/smiley-laughing.gif
+++ b/images/smiley-laughing.gif
--- a/images/smiley-money-mouth.gif
+++ b/images/smiley-money-mouth.gif
--- a/images/smiley-sealed.gif
+++ b/images/smiley-sealed.gif
--- a/images/smiley-smile.gif
+++ b/images/smiley-smile.gif
--- a/images/smiley-surprised.gif
+++ b/images/smiley-surprised.gif
--- a/images/smiley-tongue-out.gif
+++ b/images/smiley-tongue-out.gif
--- a/images/smiley-undecided.gif
+++ b/images/smiley-undecided.gif
--- a/images/smiley-wink.gif
+++ b/images/smiley-wink.gif
--- a/images/smiley-yell.gif
+++ b/images/smiley-yell.gif