diff options
| author |  Barrucadu <mike@barrucadu.co.uk> | 2009-05-18 22:01:30 +0100 |
|---|---|---|
| committer | Barrucadu <mike@barrucadu.co.uk> | 2009-05-18 22:01:30 +0100 |
| commit | 992230601106aadf0146cb022cd240136ae2f261 (patch) | |
| tree | 97ddf5a50943ddc5deb28e4beaea56dbb9ee68e0 /docs | |
| parent | 7e301b27e4e61e0c1bd1bc40f1008608969033e6 (diff) | |
| parent | 30131ffa360fc398e8b6393159f992f1adf89af1 (diff) | |
Merge branch 'dieter/experimental' into experimental
Conflicts:
uzbl.c
uzbl.h
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/CONTRIBUTING | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/CONTRIBUTING b/docs/CONTRIBUTING index f351da9..9a2ff35 100644 --- a/docs/CONTRIBUTING +++ b/docs/CONTRIBUTING @@ -25,6 +25,10 @@ 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 |