summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-03-09 11:43:53 -0700
committerBrian <brian@yutani.localnet.net>2007-03-09 11:43:53 -0700
commit2cf5fd48d1586f961910a14324a457854cb66221 (patch)
tree6b8690b1e3ac2b59369356d692214cc7d6a889c6 /docs
parent9f44247acf62b91669f77974a4bbad687d58859e (diff)
parentf9f79c8d770e696249bd98c68b563f887562c974 (diff)
downloadexternal_mesa3d-2cf5fd48d1586f961910a14324a457854cb66221.zip
external_mesa3d-2cf5fd48d1586f961910a14324a457854cb66221.tar.gz
external_mesa3d-2cf5fd48d1586f961910a14324a457854cb66221.tar.bz2
Merge branch 'origin' into glsl-compiler-1
Conflicts: src/mesa/main/context.c
Diffstat (limited to 'docs')
-rw-r--r--docs/repository.html8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/repository.html b/docs/repository.html
index d09fc18..39f5da4 100644
--- a/docs/repository.html
+++ b/docs/repository.html
@@ -96,8 +96,12 @@ code while a branch has the latest stable code.
</p>
<p>
-Questions about active Mesa development branches should be posted to
-the mesa3d-dev mailing list.
+The command <code>git-branch</code> will list all available branches.
+</p>
+
+<p>
+Questions about branch status/activity should be posted to the
+mesa3d-dev mailing list.
</p>