summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorDidier Raboud <didier@raboud.com>2010-05-23 00:04:48 +0200
committerDidier Raboud <didier@raboud.com>2010-05-23 00:04:48 +0200
commitc84613d248ecfcbb98d00a102e3a3f1fa2f75ef2 (patch)
treec7289181a58a59ccc523fe0406efd3b11f4cb151 /COPYING
parentdbedc38096374d695ca302bf6084d0688102db71 (diff)
parent2e1e8345749b1863af8d804c2ce351836f282368 (diff)
Merge branch 'upstream'
Diffstat (limited to 'COPYING')
-rw-r--r--[-rwxr-xr-x]COPYING0
1 files changed, 0 insertions, 0 deletions
diff --git a/COPYING b/COPYING
index 5b6e7c6..5b6e7c6 100755..100644
--- a/COPYING
+++ b/COPYING