Merge pull request #684 from TsudaKageyu/save-mpeg

author Tsuda Kageyu <tsuda.kageyu@gmail.com>

Thu, 17 Dec 2015 02:24:25 +0000 (11:24 +0900)

committer Tsuda Kageyu <tsuda.kageyu@gmail.com>

Thu, 17 Dec 2015 02:24:25 +0000 (11:24 +0900)
author Tsuda Kageyu <tsuda.kageyu@gmail.com>
Thu, 17 Dec 2015 02:24:25 +0000 (11:24 +0900)
committer Tsuda Kageyu <tsuda.kageyu@gmail.com>
Thu, 17 Dec 2015 02:24:25 +0000 (11:24 +0900)
diff --cc taglib/mpeg/mpegfile.cpp
Simple merge
diff --cc tests/test_id3v2.cpp
Simple merge
diff --cc tests/test_mpeg.cpp
Simple merge
author	Tsuda Kageyu <tsuda.kageyu@gmail.com>
	Thu, 17 Dec 2015 02:24:25 +0000 (11:24 +0900)
committer	Tsuda Kageyu <tsuda.kageyu@gmail.com>
	Thu, 17 Dec 2015 02:24:25 +0000 (11:24 +0900)
		1	2
taglib/mpeg/mpegfile.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_id3v2.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_mpeg.cpp	patch \|	diff1 \|	diff2 \|	blob \| history