mesa: Branch 'master' - 5 commits

[Brian Paul]

 docs/repository.html                   |    8 ++++++--
 src/mesa/drivers/dri/common/dri_util.c |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
diff-tree 3528d61820e9ae1aafb12fb90849155f3cab6d2c (from 46d48802010975548338a4b749e237f8b3758299)
Author: Panagiotis Papadakos <papadako at csd.uoc.gr>
Date:   Mon Feb 26 07:57:31 2007 -0700

    add missing param to _mesa_warning()

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index cc3dcf9..3e27052 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -420,7 +420,7 @@ __driUtilUpdateDrawableInfo(__DRIdrawabl
     psp = pdp->driScreenPriv;
     if (!psp) {
 	/* ERROR!!! */
-       _mesa_problem("Warning! Possible infinite loop due to bug "
+       _mesa_problem(NULL, "Warning! Possible infinite loop due to bug "
 		     "in file %s, line %d\n",
 		     __FILE__, __LINE__);
 	return;
diff-tree 46d48802010975548338a4b749e237f8b3758299 (from parents)
Merge: 9d8df479961a6ee21a4848bbcd44f0bd63c0ed44 c080123998f28d9317331aec7ddfcd1074b29daf
Author: Brian <brian at yutani.localnet.net>
Date:   Mon Feb 26 07:56:43 2007 -0700

    Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

diff-tree 9d8df479961a6ee21a4848bbcd44f0bd63c0ed44 (from parents)
Merge: 53bcdedc329807b4d77f0c8b3e23282e204103a7 d9fb113e0571dba9ac29576015cb5816c53ac467
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Feb 24 18:29:57 2007 -0700

    Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

diff-tree 53bcdedc329807b4d77f0c8b3e23282e204103a7 (from parents)
Merge: 18e9ca5fb03c90ecf8041a63efed7e8812745c14 4a1d7d6641ab9e66edce9d98456b978fe90a0617
Author: Brian <brian at yutani.localnet.net>
Date:   Thu Feb 22 08:57:36 2007 -0700

    Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

diff-tree 18e9ca5fb03c90ecf8041a63efed7e8812745c14 (from 906fd23e1d32bd19237525a261100e6d71f38f5e)
Author: Brian <brian at yutani.localnet.net>
Date:   Tue Feb 20 09:24:06 2007 -0700

    more branch info

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 stabl
 </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>