Daniel Heule 2b5929c881 Merge branch 'master' of https://github.com/telmich/cdist into feature__cdist_autodep_try2 ... Conflicts: docs/man/man7/cdist-manifest.text		2014-02-06 15:10:34 +01:00
..
dev	add log from today	2014-01-20 16:19:41 +01:00
gfx	add scaled version of the cdist logo	2014-01-20 10:11:23 +01:00
man	Merge branch 'master' of https://github.com/telmich/cdist into feature__cdist_autodep_try2	2014-02-06 15:10:34 +01:00
speeches	add final version of presentation + pdf variant	2013-11-22 20:57:16 +01:00
video
web	use absolute links	2013-12-24 23:30:33 +01:00
changelog	++changes	2014-02-05 23:15:56 +01:00