diff options
| author |  Barrucadu <mike@barrucadu.co.uk> | 2009-05-19 12:49:31 +0100 |
|---|---|---|
| committer | Barrucadu <mike@barrucadu.co.uk> | 2009-05-19 12:49:31 +0100 |
| commit | 6e04841f1143eaf21e5b9647144eee4184aaf6a0 (patch) | |
| tree | 6529998a12037f98d9a35174f5b1246029f79d0f /docs/CONTRIBUTING | |
| parent | 87912a756633806cc8fb1d1b19a41109fe4fb86a (diff) | |
Revert "Merge branch 'dieter/experimental' into experimental"
This reverts commit 992230601106aadf0146cb022cd240136ae2f261, reversing
changes made to 7e301b27e4e61e0c1bd1bc40f1008608969033e6.
Diffstat (limited to 'docs/CONTRIBUTING')
| -rw-r--r-- | docs/CONTRIBUTING | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/CONTRIBUTING b/docs/CONTRIBUTING index 9a2ff35..f351da9 100644 --- a/docs/CONTRIBUTING +++ b/docs/CONTRIBUTING @@ -25,10 +25,6 @@ If you're new to Git/github, have no fear: * [Github guides (highly recommended)](http://github.com/guides/home) * [Guides: Fork a project and submit your modifications](http://github.com/guides/fork-a-project-and-submit-your-modifications) -Our convention is to develop in the *experimental* branch, and keep only stable, tested stuff in *master*. -So ideally, all contributors develop in their experimental, that gets merged into the mainline experimental, and after QA it gets merged into the main master. - - ### VALGRIND PROFILING $ add this to Makefile header: CFLAGS=-g $ recompile |