summaryrefslogtreecommitdiff
path: root/releasing.txt
diff options
context:
space:
mode:
authorBryce Harrington <bryce@osg.samsung.com>2015-01-09 18:09:20 -0800
committerBryce Harrington <bryce@osg.samsung.com>2015-01-20 17:25:20 -0800
commitae71579832d790223f44eb5e503e93b7926c019b (patch)
tree6cd6d41820601ecdfa159a31bebfd35bd73aa7f6 /releasing.txt
parent61613576fe40e5992e5f78779d4526e73a5ed58f (diff)
downloadweston-ae71579832d790223f44eb5e503e93b7926c019b.tar.gz
weston-ae71579832d790223f44eb5e503e93b7926c019b.tar.bz2
weston-ae71579832d790223f44eb5e503e93b7926c019b.zip
releasing: Typo
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Diffstat (limited to 'releasing.txt')
-rw-r--r--releasing.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/releasing.txt b/releasing.txt
index 2db84d5c..2debcd09 100644
--- a/releasing.txt
+++ b/releasing.txt
@@ -26,7 +26,7 @@ To make a release follow these steps.
10. Update topic in #wayland to point to release announcement
For x.y.0 releases, also create the x.y branch. The x.y branch is for
-bug fixes and conservetive changes to the x.y.0 release, and is where
+bug fixes and conservative changes to the x.y.0 release, and is where
we release x.y.z releases from. Creating the x.y branch opens up
master for new development and lets new development move on. We've
done this both after the x.y.0 release (to focus development on bug