aboutsummaryrefslogtreecommitdiff
path: root/libX11/COPYING
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-09-22 08:56:07 +0000
committermarha <marha@users.sourceforge.net>2010-09-22 08:56:07 +0000
commit4e512860d6f0a7644ae3872d91edafa9040f608a (patch)
treeceadfe99e76c6f2f155d8ad09c8b98f57ca6400c /libX11/COPYING
parentf5d19a3432c13e7b3262b3771468cc42e25d2e8c (diff)
parent6a14682c40a85bbfdb5023a3330e95a3a3c0ad03 (diff)
downloadvcxsrv-4e512860d6f0a7644ae3872d91edafa9040f608a.tar.gz
vcxsrv-4e512860d6f0a7644ae3872d91edafa9040f608a.tar.bz2
vcxsrv-4e512860d6f0a7644ae3872d91edafa9040f608a.zip
svn merge ^/branches/released .
Diffstat (limited to 'libX11/COPYING')
-rw-r--r--libX11/COPYING2
1 files changed, 1 insertions, 1 deletions
diff --git a/libX11/COPYING b/libX11/COPYING
index e15e3ecab..df1e85a69 100644
--- a/libX11/COPYING
+++ b/libX11/COPYING
@@ -13,7 +13,7 @@ to that file.
Copyright (C) 2003-2006,2008 Jamey Sharp, Josh Triplett
Copyright © 2009 Red Hat, Inc.
-Copyright 1990-1992,1999,2000,2004,2009 Oracle and/or its affiliates.
+Copyright 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a