From 0130346adbce7e6b2422429887fc46c76806d845 Mon Sep 17 00:00:00 2001
From: marha
Date: Thu, 4 Oct 2012 10:53:47 +0200
Subject: randrproto mesa pixman git update 4 oct 2012
randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455
mesa: 185d6df3c10a7ff5defe163af614bfc41088910b
pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
---
mesalib/docs/devinfo.html | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
(limited to 'mesalib/docs/devinfo.html')
diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html
index 90752b750..8f4aeef5f 100644
--- a/mesalib/docs/devinfo.html
+++ b/mesalib/docs/devinfo.html
@@ -156,6 +156,30 @@ src/mesa/state_tracker/st_glsl_to_tgsi.cpp can serve as examples.
+Marking a commit as a candidate for a stable branch
+
+
+If you want a commit to be applied to a stable branch,
+you should add an appropriate note to the commit message.
+
+
+
+Here are some examples of such a note:
+
+
+ - NOTE: This is a candidate for the 9.0 branch.
+ - NOTE: This is a candidate for the 8.0 and 9.0 branches.
+ - NOTE: This is a candidate for the stable branches.
+
+
+
+Cherry-picking candidates for a stable branch
+
+
+Please use git cherry-pick -x <commit>
for cherry-picking a commit
+from master to a stable branch.
+
+
Making a New Mesa Release
--
cgit v1.2.3