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/composite | |
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/composite')
-rw-r--r-- | xorg-server/composite/compalloc.c | 2 | ||||
-rw-r--r-- | xorg-server/composite/compext.c | 2 | ||||
-rw-r--r-- | xorg-server/composite/compinit.c | 2 | ||||
-rw-r--r-- | xorg-server/composite/compint.h | 2 | ||||
-rw-r--r-- | xorg-server/composite/compoverlay.c | 2 | ||||
-rw-r--r-- | xorg-server/composite/compwindow.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c index d7d28ea98..c69a9c05c 100644 --- a/xorg-server/composite/compalloc.c +++ b/xorg-server/composite/compalloc.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/composite/compext.c b/xorg-server/composite/compext.c index 2ee6f1259..d6f26d688 100644 --- a/xorg-server/composite/compext.c +++ b/xorg-server/composite/compext.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/composite/compinit.c b/xorg-server/composite/compinit.c index d3910c4b4..98b8d0565 100644 --- a/xorg-server/composite/compinit.c +++ b/xorg-server/composite/compinit.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/composite/compint.h b/xorg-server/composite/compint.h index f78884985..a85d62faa 100644 --- a/xorg-server/composite/compint.h +++ b/xorg-server/composite/compint.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"),
diff --git a/xorg-server/composite/compoverlay.c b/xorg-server/composite/compoverlay.c index 7711ba04a..6ac05e8ad 100644 --- a/xorg-server/composite/compoverlay.c +++ b/xorg-server/composite/compoverlay.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/composite/compwindow.c b/xorg-server/composite/compwindow.c index 539c1aa23..11df8b39d 100644 --- a/xorg-server/composite/compwindow.c +++ b/xorg-server/composite/compwindow.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"),
|