Merge branch 'krejclu6_chapters' of https://github.com/krejclu6/taglib into krejclu6_chapters

Browse Source

Conflicts:
	taglib/mpeg/id3v2/id3v2framefactory.cpp
	tests/test_id3v2.cpp

...

This commit is contained in:

Lukas Krejci 2014-05-18 16:29:54 +02:00

parent 500b3e630b 1ce5385e30

commit 459adc69ad

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