diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-01 08:18:50 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-01 08:18:50 +0300 |
commit | bec3b84f5ef798ab843028dd62018571a50330ed (patch) | |
tree | a1805e73289111518e6343d255da1085736cb7f1 /osdep | |
parent | 9d27862072a233b423d4a81e966b1ba9627724a6 (diff) | |
parent | 19c9e0aceb9620c862cab91b509df91931821d66 (diff) | |
download | mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.bz2 mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.xz |
Merge svn changes up to r26624
Conflicts:
Makefile
Diffstat (limited to 'osdep')
-rw-r--r-- | osdep/mplayer.rc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/osdep/mplayer.rc b/osdep/mplayer.rc index 0436bfbba5..3bcfdb2197 100644 --- a/osdep/mplayer.rc +++ b/osdep/mplayer.rc @@ -4,7 +4,7 @@ and add resfile.o to OBJS_MPLAYER in Makefile*/ #include <winver.h> -#include "../version.h" +#include "version.h" 1 VERSIONINFO FILEVERSION 0,0,9,0 @@ -35,5 +35,5 @@ FILETYPE VFT_APP } } -IDI_ICON1 ICON DISCARDABLE "../etc/mplayer.ico" +IDI_ICON1 ICON DISCARDABLE "etc/mplayer.ico" |