Viewing all changes in revision 188.
- Committer: Hubert Figuière
- Date: 2014-04-22 18:02:25 UTC
- mfrom: (181.1.9)
- Revision ID: git-v1:5013ac34dda98b65d8916eca1303488abaade995
Merge branch 'exempi-2.3-branch'
Conflicts:
samples/source/common/LargeFileAccess.cpp
source/XMPFiles/FileHandlers/MP3_Handler.cpp
source/XMPFiles/FormatSupport/ID3_Support.hpp
Conflicts:
samples/source/common/LargeFileAccess.cpp
source/XMPFiles/FileHandlers/MP3_Handler.cpp
source/XMPFiles/FormatSupport/ID3_Support.hpp
expand all
collapse all
added
removed
