prepare more stuff for 1.2

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-18 02:11:35 +01:00 · 2011-03-18 02:11:35 +01:00 · d2b7fd0520
parent 4c54a6c159
commit d2b7fd0520
2 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@ -115,11 +115,12 @@ how to use cdist.
 There are at least the following branches available:

 * master: the development branch
- * 1.1: Current stable
+ * 1.2: Current stable: Dependencies supported

 Old versions:

 * 1.0: First official release
+ * 1.1: __file to __file, __directory, __link migration

 Other branches may be available for features or bugfixes, but they
 may vanish at any point. To select a specific branch use
--- a/doc/dev/todo/post-1.2
+++ b/doc/dev/todo/post-1.2