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

Browse Source

* remotes/upstream/master:
  diabook-themes: added js for auto-growing comment-textareas
  diabook: theme-settings: add a wide-option
  Another bunch of executable permission removal
  Removed execution permission: lintian warning in Debian packaging

* master:

...

This commit is contained in:

Simon L'nu 2012-04-15 00:40:21 -04:00

parent dddf3307af

commit adc932a5e2

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 Not Available