Merge remote-tracking branch 'origin/Applications/14.12'

Browse Source

Conflicts:
	VERSION
	core/version.h

remotes/origin/pdfprintpdf

Albert Astals Cid 11 years ago

parent a27ca79cf3 adf39b2ed6

commit 281aee26f2

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available