Merge branch 'master' into taglib2

Browse Source

Conflicts:
	taglib/toolkit/tiostream.cpp

...

This commit is contained in:

Lukáš Lalinský

2013-06-21 08:04:00 +02:00

parent 90d43956ec 7e866e11ad

commit c066ccd32d

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

Diff Content Not Available