fixed: [OS X] botched merge.
authorleafmuncher <leafmuncher@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 11 Mar 2008 08:18:40 +0000 (08:18 +0000)
committerleafmuncher <leafmuncher@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 11 Mar 2008 08:18:40 +0000 (08:18 +0000)
commit0fc1f7182db92065418a56a0de1768f89d6682fe
tree94bfa4937290745257fb9d2e3de5f5ea124e6f6d
parentdaf07ee017c5a05e1910a239f55fe5fad229951d
fixed: [OS X] botched merge.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport@12028 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
XBMC/xbmc/Application.cpp
XBMC/xbmc/FileSystem/FileCurl.cpp