aboutsummaryrefslogtreecommitdiffstats
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-03-11 22:15:03 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-03-11 22:15:03 +0100
commit85901329b0794b136b96bf745f4ab1572806fc89 (patch)
treef23da7e97cae727f39d825f0fef8348cffb238e4 /CONTRIBUTING.md
parent3db2e44f186c59429901b2c899e139ea60117a55 (diff)
parentcf5da997da8820b4050f5b87ee9440a0ede36d1f (diff)
downloadjitsi-master.zip
jitsi-master.tar.gz
jitsi-master.tar.bz2
Merge commit 'cf5da99'HEADmaster
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd63c69..d2e21fe 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,10 +42,10 @@ Found a bug and know how to fix it? Great! Please read on.
## Contributor License Agreement
While Jitsi is released under the
-[Apache](https://github.com/jitsi/jitsi/blob/master/LICENSE), the copyright
-holder and principal creator is [Blue Jimp](http://www.bluejimp.com/). To
-ensure that we can continue making Jitsi available under an open source license
-and still pay our bills, we need you to sign our Apache-based contributor
+[Apache License](https://github.com/jitsi/jitsi/blob/master/LICENSE), the copyright
+holder and principal creator is [Atlassian](https://www.atlassian.com/). To
+ensure that we can continue making Jitsi available under an open source license,
+we need you to sign our Apache-based contributor
license agreement as either a [corporation](https://jitsi.org/ccla) or an
[individual](https://jitsi.org/icla). If you cannot accept the terms laid out
in the agreement, unfortunately, we cannot accept your contribution.
@@ -54,6 +54,9 @@ in the agreement, unfortunately, we cannot accept your contribution.
- Please read and follow the [code conventions](https://jitsi.org/Documentation/CodeConvention),
especially the limit on 80 characters per line.
- Do not reformat existing code.
+- Command-Line [build instructions](https://jitsi.org/Documentation/RetrievingAndBuildingTheSources)
+- How to set up [Eclipse](https://jitsi.org/Documentation/ConfigureEclipseNew)
+- Read the [tutorials](https://jitsi.org/Documentation/DeveloperDocumentation) (some of this information might be a bit dated, but it is still a very useful resource)
## Creating Pull Requests
- Perform **one** logical change per pull request.