]> granicus.if.org Git - taglib/commitdiff
Merge remote-tracking branch 'nightingale/master'
authorLukáš Lalinský <lalinsky@gmail.com>
Wed, 10 Oct 2012 14:45:36 +0000 (16:45 +0200)
committerLukáš Lalinský <lalinsky@gmail.com>
Wed, 10 Oct 2012 14:45:36 +0000 (16:45 +0200)
1  2 
taglib/mpeg/id3v2/id3v2frame.cpp

Simple merge