aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-05-23 20:33:50 +0200
committerSamuel Tardieu <sam@rfc1149.net>2013-05-23 20:33:50 +0200
commit4b14aaf18789616d44fa97d98f79deb4159f4e71 (patch)
treeb29e03ac7918a332f50ccf80551d988165a4b635 /README.md
parent8a65466c9c79e529c80ff0dd0091099126b8b3a4 (diff)
parente01cf90397eeb85bc18f8648c4942b6dba460513 (diff)
downloadcgeo-4b14aaf18789616d44fa97d98f79deb4159f4e71.zip
cgeo-4b14aaf18789616d44fa97d98f79deb4159f4e71.tar.gz
cgeo-4b14aaf18789616d44fa97d98f79deb4159f4e71.tar.bz2
Merge branch 'release' into upstream
Diffstat (limited to 'README.md')
-rw-r--r--README.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index 9533a93..80950d4 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,14 @@
You want to contribute?
-----------------------
-Perfect! Please **tell us in the [issue tracker](https://github.com/cgeo/c-geo-opensource/issues) before hacking** on your great new feature. It would be bad if you have implemented something great, but we can't include it because it doesn't fit the remaining architecture and code. You might also want to chat with the developers on channel #cgeo on the freenode IRC network.
+Perfect! Please **tell us in the [issue tracker](https://github.com/cgeo/cgeo/issues) before hacking** on your great new feature. It would be bad if you have implemented something great, but we can't include it because it doesn't fit the remaining architecture and code. You might also want to chat with the developers on channel #cgeo on the freenode IRC network.
[![Build Status](http://ci.cgeo.org/job/c-geo/badge/icon)](http://ci.cgeo.org/job/c-geo/)
Get the source
--------------
-Fork the [project source code](https://github.com/cgeo/c-geo-opensource), make changes to your clone and [create a pull request](https://help.github.com/articles/using-pull-requests) afterwards.
+Fork the [project source code](https://github.com/cgeo/cgeo), make changes to your clone and [create a pull request](https://help.github.com/articles/using-pull-requests) afterwards.
### Branches ###
@@ -17,14 +17,14 @@ Fork the [project source code](https://github.com/cgeo/c-geo-opensource), make c
- **release** is for all bug fixes of already existing features. So if a bug is reported in released version, it should be fixed on this branch (and merged to master afterwards).
A more complex bugfix can be first tested against the `master` branch and integrated in the nightly builds, while kept compatible with the `release` branch for a later integration.
-Such a procedure is [described in the wiki](https://github.com/cgeo/c-geo-opensource/wiki/How-to-get-a-bug-fix-into-the-release).
+Such a procedure is [described in the wiki](https://github.com/cgeo/cgeo/wiki/How-to-get-a-bug-fix-into-the-release).
Set up Eclipse
--------------
- Install an Eclipse distribution for your OS from http://eclipse.org/downloads/ (you may choose the Java developers distribution).
- Start Eclipse, choose any directory as workspace. Close the welcome screen, if it appears.
-- After the workbench has started, select File | Import | Install | Install Software Items From File and select a locally downloaded copy of https://github.com/cgeo/c-geo-opensource/tree/master/main/project/eclipse%20installation/cgeo%20eclipse%20components.p2f. This way you can easily install all necessary plugins.
+- After the workbench has started, select File | Import | Install | Install Software Items From File and select a locally downloaded copy of https://github.com/cgeo/cgeo/tree/master/main/project/eclipse%20installation/cgeo%20eclipse%20components.p2f. This way you can easily install all necessary plugins.
- After forking the project you should import the Eclipse projects in your workspace with File | Import | Projects from Git.
Build