Merge branch 'next'

Browse Source

...

This commit is contained in:

Damjan Adamic

2014-05-05 22:13:24 +02:00

parent b9ee1d5dee

commit 61addd3d4e

42 changed files with 1291 additions and 1185 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

companion/src/printdialog.cpp

+873 -874

File diff suppressed because it is too large Load Diff