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

Browse source

* remotes/upstream/master:
  diabook-themes: theme-settings: "wide"-option and new screenshots

* master:

...

This commit is contained in:

Simon L'nu 2012-04-17 15:36:45 -04:00

parent 5b407b5ee7

commit 74b237d46d

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

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

Diff content is not available