summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-13 18:24:59 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-13 18:24:59 -0400
commit7c315f56f1a5b9ed7742f48a9a0b836a47f44458 (patch)
tree601958d2ce50dccdee6b2c11bffe01209970ca77 /COPYING
parent2ed952e2207d5278cfe96db2d7eeed40709f846b (diff)
parenta7275bfcb21bccff64ccc544676406cb6318a021 (diff)
Merge commit 'dkg/master'
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING1
1 files changed, 1 insertions, 0 deletions
diff --git a/COPYING b/COPYING
index 14d0ee0..36b1d08 100644
--- a/COPYING
+++ b/COPYING
@@ -8,6 +8,7 @@ It is free software, developed by:
Micah Anderson <micah@riseup.net>
Matthew Goins <mjgoins@openflows.com>
Mike Castleman <mlcastle@mlcastle.net>
+ Elliot Winard <enw@caveteen.com>
Greg Lyle <greg@stealthisemail.com>
MonkeySphere is distributed in the hope that it will be useful, but