diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-12 20:34:06 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-12 20:34:06 +0000 |
| commit | d3ae6e21a12209f5c8cb8c84ba0f68fb69736844 (patch) | |
| tree | 62710b8524ebc7675ebd7f4976fd7f9530ce5df2 /xorg-server/xfixes | |
| parent | 0be679f7724e33c2761ebb67846707fb3351167b (diff) | |
| parent | 3a20d23b48c1051e1f22295fd886cc7f643417f6 (diff) | |
| download | vcxsrv-d3ae6e21a12209f5c8cb8c84ba0f68fb69736844.tar.gz vcxsrv-d3ae6e21a12209f5c8cb8c84ba0f68fb69736844.tar.bz2 vcxsrv-d3ae6e21a12209f5c8cb8c84ba0f68fb69736844.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xfixes')
| -rw-r--r-- | xorg-server/xfixes/cursor.c | 2 | ||||
| -rw-r--r-- | xorg-server/xfixes/xfixes.c | 2 | ||||
| -rw-r--r-- | xorg-server/xfixes/xfixesint.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c index bc3b321e0..14bdafbf3 100644 --- a/xorg-server/xfixes/cursor.c +++ b/xorg-server/xfixes/cursor.c @@ -1,5 +1,5 @@ /*
- * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/xorg-server/xfixes/xfixes.c b/xorg-server/xfixes/xfixes.c index 67b34f346..80f212273 100644 --- a/xorg-server/xfixes/xfixes.c +++ b/xorg-server/xfixes/xfixes.c @@ -1,5 +1,5 @@ /*
- * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/xorg-server/xfixes/xfixesint.h b/xorg-server/xfixes/xfixesint.h index 7824ac6ee..a2a8e4163 100644 --- a/xorg-server/xfixes/xfixesint.h +++ b/xorg-server/xfixes/xfixesint.h @@ -1,5 +1,5 @@ /*
- * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
|