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 5275d1271f 0c4ca94a0c

commit 49bc4c34cc

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