Merge branch 'stable'

pull/25/head
Volker Grabsch 12 years ago
commit 93a81aec2c

@ -480,7 +480,8 @@ USE_OSGPLUGIN(<plugin2>)
<p>
The following <code>.git/config</code> settings ensure
that the stable branch will always be pushed to the
<code>gh-pages</code> branch in addition to the
<code><a href="http://help.github.com/pages/">gh-pages</a></code>
branch in addition to the
<code>stable</code> branch,
thus ensuring the website will always stay in sync:
</p>

Loading…
Cancel
Save