summaryrefslogtreecommitdiffstats
path: root/gui/mplayer/gtk/menu.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-23 14:23:49 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-23 14:23:49 +0300
commit70e0372a51ec0d040e996d56101b731a4b72d11d (patch)
tree91b2f65db46d8846696ba83a3d61d526ab9380b5 /gui/mplayer/gtk/menu.c
parente14d43f764c5043e5907852e09d61db912ee49f2 (diff)
parentc051bef87c5a7337b2aca3d4b77fc392a8392780 (diff)
downloadmpv-70e0372a51ec0d040e996d56101b731a4b72d11d.tar.bz2
mpv-70e0372a51ec0d040e996d56101b731a4b72d11d.tar.xz
Merge svn changes up to r26510
r26469 and r26470 (which revert files to inferior versions "because it's policy") are ignored.
Diffstat (limited to 'gui/mplayer/gtk/menu.c')
-rw-r--r--gui/mplayer/gtk/menu.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c
index 0698c68e6b..eefae6b31e 100644
--- a/gui/mplayer/gtk/menu.c
+++ b/gui/mplayer/gtk/menu.c
@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
#include <stdio.h>
#include <stdlib.h>