From ad2c21779d0b0fe25d68f1ce0d3140ea109e8949 Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Wed, 28 Mar 2012 16:22:47 +0200 Subject: [PATCH] Use Git terminology in docs to avoid confusion --- doc/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.html b/doc/index.html index adeabfb2..17d38a69 100644 --- a/doc/index.html +++ b/doc/index.html @@ -506,7 +506,7 @@ USE_OSGPLUGIN(<plugin2>)
  • After a successful testing phase, the whole "master" - branch will be merged (moved) into "stable". + branch will be merged into "stable" (fast-forward).