upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-24 19:49:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a merge conflict that made it in my repository.

Browse Source 
Reverting the commit ends up in the "git revert" command not
terminating. I do not know what to do else.
This commit is contained in:
fendrin 2013-05-24 05:48:49 +02:00
parent fd14514dab
commit 7729a3950e
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sound_music_track.cpp
View File

@ -82,10 +82,6 @@ void music_track::resolve()
}
#if !defined(_WIN32) && !defined(__APPLE__)
<<<<<<< HEAD
=======
>>>>>>> Disabled (hopefully) the ogg tag reading on Win and Mac.
FILE* f;
f = fopen(file_path_.c_str(), "r");
if (f == NULL) {
@ -118,13 +114,8 @@ void music_track::resolve()
}
ov_clear(&vf);
<<<<<<< HEAD
#endif
=======
#endif
>>>>>>> Disabled (hopefully) the ogg tag reading on Win and Mac.
LOG_AUDIO << "resolved music track '" << id_ << "' into '" << file_path_ << "'\n";
}