diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-14 12:55:02 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-14 12:55:02 +0000 |
commit | 93e9e860d75ac0e4e449716cfb65518e14409d4f (patch) | |
tree | 4227d0f2537aefe75abadd3aa26ff238902bdbb1 /gui/mplayer/gtk | |
parent | 89dfec20a2ec4b264d3f89dba37694b856d4cebf (diff) | |
download | mpv-93e9e860d75ac0e4e449716cfb65518e14409d4f.tar.bz2 mpv-93e9e860d75ac0e4e449716cfb65518e14409d4f.tar.xz |
Rename gui/mplayer/gtk/menu.[ch] --> gui/mplayer/gtk/gtkmenu.[ch].
This avoids confusion with headers of the same name in other places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30573 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui/mplayer/gtk')
-rw-r--r-- | gui/mplayer/gtk/gtk_menu.c (renamed from gui/mplayer/gtk/menu.c) | 2 | ||||
-rw-r--r-- | gui/mplayer/gtk/gtk_menu.h (renamed from gui/mplayer/gtk/menu.h) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/gtk_menu.c index 48736ce81b..14387f84ca 100644 --- a/gui/mplayer/gtk/menu.c +++ b/gui/mplayer/gtk/gtk_menu.c @@ -25,7 +25,7 @@ #include "access_mpcontext.h" #include "mixer.h" -#include "menu.h" +#include "gtk_menu.h" #include "gui/mplayer/widgets.h" #include "gui/mplayer/gmplayer.h" #include "gui/app.h" diff --git a/gui/mplayer/gtk/menu.h b/gui/mplayer/gtk/gtk_menu.h index a5e86d70ee..a5e86d70ee 100644 --- a/gui/mplayer/gtk/menu.h +++ b/gui/mplayer/gtk/gtk_menu.h |