Merge remote-tracking branch 'upstream/master'

Browse source

Conflicts:
	images/smiley-beard.png

...

This commit is contained in:

Thomas 2012-03-06 23:56:37 +00:00

parent 22624917e0 05a52b2660

commit dadf80f644

18 changed files with 359 additions and 222 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

images/beard.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 989 B

BIN

images/whitebeard.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 951 B