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

Browse source

* remotes/upstream/master:
  theme screenshots

* master:

...

This commit is contained in:

Simon L'nu 2012-03-25 22:40:24 -04:00

parent 3d62cb9782 7ab117fd31

commit 758e1b7424

6 changed files with 22 additions and 2 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

view/theme/comix-plain/screenshot.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 316 KiB