summaryrefslogtreecommitdiffstats
path: root/vidix/sis_bridge.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-23 20:56:50 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-23 20:56:50 +0200
commit0406d951209df261970424256d76f293649ec140 (patch)
tree622259272e33995869f234cf18f76201e5272241 /vidix/sis_bridge.c
parent79e1aa7cc7a9ac695c3af361bca72013ef272885 (diff)
parent39b7c1576d826cfd72f34a3491a094d07b3d7041 (diff)
downloadmpv-0406d951209df261970424256d76f293649ec140.tar.bz2
mpv-0406d951209df261970424256d76f293649ec140.tar.xz
Merge svn changes up to r28348
Diffstat (limited to 'vidix/sis_bridge.c')
-rw-r--r--vidix/sis_bridge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vidix/sis_bridge.c b/vidix/sis_bridge.c
index 4dd8fe92c3..f143754a9a 100644
--- a/vidix/sis_bridge.c
+++ b/vidix/sis_bridge.c
@@ -2,9 +2,9 @@
* VIDIX driver for SiS chipsets.
* Video bridge detection for SiS 300 and 310/325 series.
*
- * Copyright (C) 2003 Jake Page, Sugar Media.
+ * Copyright (C) 2003 Jake Page, Sugar Media
* Based on SiS Xv driver
- * Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria.
+ * Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria
*
* This file is part of MPlayer.
*