README.contributors | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
New commits: commit 94364adade4dc27e5d80bc14511d4f2b7ea4ab0d Merge: 164805b 47f30fa Author: Albert Astals Cid <[email protected]> Date: Mon Feb 18 20:34:34 2013 +0100 Merge remote-tracking branch 'origin/poppler-0.22' commit 47f30fa96e62fc215c0e80f42517908760ef8065 Author: Brad Hards <[email protected]> Date: Mon Feb 18 20:38:10 2013 +1100 Minor rewording of contributor README diff --git a/README.contributors b/README.contributors index 58d9759..5b7ac51 100644 --- a/README.contributors +++ b/README.contributors @@ -2,18 +2,19 @@ If you want to become or are a poppler contributor, this is a README for you, ke Licensing --------- -Only send patches to poppler if you agree to relicense them under GPLv2 or later, -if you don't agree to such license, you should explain us the problem or bug -and how you would solve it by words. +Only send patches to poppler if you agree to license (or relicense) them under +GPLv2 and later (or something more permissive that can be "upgraded" to GPLv2 +and later. If you do not agree to this license, please explain the problem / bug +and how you would solve it in words instead of code. -By default all patches attache to the bugzilla or the mailing list would be assumed -to agree with the licensing expressed here +By default all patches attached to the bugzilla or sent to the mailing list will +be assumed to agree with the licensing expressed here. Channels of contact ------------------- Poppler has three main channels of contact: * The poppler mailing list http://lists.freedesktop.org/mailman/listinfo/poppler - * The poppler bugzilla http://bugs.freedesktop.org + * The poppler bug tracker (bugzilla) http://bugs.freedesktop.org * The #poppler channel at the freenode network Do not hesitate to drop by talk to people there. _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
