[Kde-winbuild] Build error in kdesupport/phonon on msvc2008

[kdewinbuild at googlemail.com]

The full log can be found here: http://winkde.org/pub/kde/ports/win32/releases/nightly/20100928/logs/log-msvc2008-kdesupport_phonon.txt

09/28/2010 12:04
emerge debug: buildAction: fetch
emerge debug: packageName: kdesupport/phonon
emerge debug: buildType: RelWithDebInfo
emerge debug: buildTests: True
________________________________________________________________________________
msys execute: c:\kde\kde-vc90\dev-utils\git\bin\sh.exe --login -c "cd /c/kde/download/svn-src/phonon && git pull"
>From git://gitorious.org/phonon/phonon
   aecdcb7..9bf4bf3  master     -> origin/master
error: Your local changes to 'phonon/CMakeLists.txt' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge.
emerge fatal error: command fetch failed
emerge fatal error: running python c:\kde\kde-vc90\emerge\portage\kdesupport\phonon\phonon-4.3.1.20090227.py fetch