summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2013-01-23 18:32:04 (GMT)
committerJason Evans <jasone@canonware.com>2013-01-23 18:32:04 (GMT)
commit83789f45307379e096c4e8be81d9e9a51e3f5a4a (patch)
treef8e39c4489cd99df1ed53475e79a4e5fe76483c2 /COPYING
parent87499f6748ebe4817571e817e9f680ccb5bf54a9 (diff)
parentb5681fb20c17478f2193fead19b7788807e39996 (diff)
downloadjemalloc-3.3.0.zip
jemalloc-3.3.0.tar.gz
jemalloc-3.3.0.tar.bz2
Merge branch 'dev'3.3.0
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING4
1 files changed, 2 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index e27fc4d..019e813 100644
--- a/COPYING
+++ b/COPYING
@@ -1,10 +1,10 @@
Unless otherwise specified, files in the jemalloc source distribution are
subject to the following license:
--------------------------------------------------------------------------------
-Copyright (C) 2002-2012 Jason Evans <jasone@canonware.com>.
+Copyright (C) 2002-2013 Jason Evans <jasone@canonware.com>.
All rights reserved.
Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved.
-Copyright (C) 2009-2012 Facebook, Inc. All rights reserved.
+Copyright (C) 2009-2013 Facebook, Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: