You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Nico Schottelius bfb43079e3 Merge branch 'dev' of git://git.d-roth.li/cdist ... Conflicts: conf/manifest/init Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		14 years ago
..
logs	…
todo	Merge branch 'dev' of git://git.d-roth.li/cdist	14 years ago
config.guess	…
git-post-commit-hook	…
header	…
show_all_exported_variables	…