Merge pull request #683 from TsudaKageyu/save-mp4

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

Wed, 16 Dec 2015 02:48:52 +0000 (11:48 +0900)

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

Wed, 16 Dec 2015 02:48:52 +0000 (11:48 +0900)
author Tsuda Kageyu <tsuda.kageyu@gmail.com>
Wed, 16 Dec 2015 02:48:52 +0000 (11:48 +0900)
committer Tsuda Kageyu <tsuda.kageyu@gmail.com>
Wed, 16 Dec 2015 02:48:52 +0000 (11:48 +0900)
diff --cc taglib/mp4/mp4tag.cpp
Simple merge
diff --cc tests/test_mp4.cpp
Simple merge
author	Tsuda Kageyu <tsuda.kageyu@gmail.com>
	Wed, 16 Dec 2015 02:48:52 +0000 (11:48 +0900)
committer	Tsuda Kageyu <tsuda.kageyu@gmail.com>
	Wed, 16 Dec 2015 02:48:52 +0000 (11:48 +0900)
		1	2
taglib/mp4/mp4tag.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_mp4.cpp	patch \|	diff1 \|	diff2 \|	blob \| history