diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 14:23:49 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 14:23:49 +0300 |
| commit | 70e0372a51ec0d040e996d56101b731a4b72d11d (patch) | |
| tree | 91b2f65db46d8846696ba83a3d61d526ab9380b5 /gui/win32/gui.h | |
| parent | e14d43f764c5043e5907852e09d61db912ee49f2 (diff) | |
| parent | c051bef87c5a7337b2aca3d4b77fc392a8392780 (diff) | |
| download | mpv-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/win32/gui.h')
| -rw-r--r-- | gui/win32/gui.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/win32/gui.h b/gui/win32/gui.h index bf5a44a8cb..66d78b0cff 100644 --- a/gui/win32/gui.h +++ b/gui/win32/gui.h @@ -16,9 +16,9 @@ * 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 + * 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 */ #ifndef MPLAYER_GUI_GUI_H |