summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root>2008-05-17 12:15:30 +0000
committerroot <root>2008-05-17 12:15:30 +0000
commit0b9d2a3a9361d5ce42f5fe0590eeb2956fbe78fd (patch)
tree494a132c1c2ba09e5629e1bbdbe17c6a75452410
parentaf8dd91a176a57c5ec299a0c616489b36cfe222f (diff)
*** empty log message ***
-rw-r--r--LICENSE13
-rw-r--r--ev++.h2
2 files changed, 13 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 595e81f..df62c4f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-All files in libev are Copyright (C)2007 Marc Alexander Lehmann.
+All files in libev are Copyright (C)2007,2008 Marc Alexander Lehmann.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -23,3 +23,14 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Alternatively, the contents of this package may be used under the terms
+of the GNU General Public License ("GPL") version 2 or any later version,
+in which case the provisions of the GPL are applicable instead of the
+above. If you wish to allow the use of your version of this package only
+under the terms of the GPL and not to allow others to use your version of
+this file under the BSD license, indicate your decision by deleting the
+provisions above and replace them with the notice and other provisions
+required by the GPL in this and the other files of this package. If you do
+not delete the provisions above, a recipient may use your version of this
+file under either the BSD or the GPL.
diff --git a/ev++.h b/ev++.h
index a5ef402..52ebf29 100644
--- a/ev++.h
+++ b/ev++.h
@@ -1,7 +1,7 @@
/*
* libev simple C++ wrapper classes
*
- * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modifica-