diff options
author | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
commit | 8fedf58693f42869528b41408ac4d6012839e973 (patch) | |
tree | 62a817bea7dfc71050292d302ba94f5e349c67a7 /X11/fonts/FSproto.h | |
parent | ac14083f465166b298162a57fff0bad90e528fff (diff) | |
parent | 6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff) | |
download | vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.gz vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.bz2 vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.zip |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'X11/fonts/FSproto.h')
-rw-r--r-- | X11/fonts/FSproto.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/X11/fonts/FSproto.h b/X11/fonts/FSproto.h index 03b28089f..028156fba 100644 --- a/X11/fonts/FSproto.h +++ b/X11/fonts/FSproto.h @@ -1,4 +1,3 @@ -/* $Xorg: FSproto.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group @@ -43,7 +42,6 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/include/fonts/FSproto.h,v 1.2 2001/08/01 00:44:37 tsi Exp $ */ #ifndef _FS_PROTO_H_ #define _FS_PROTO_H_ |