git.tue.mpg.de Git - dss.git/commit

]> git.tue.mpg.de Git - dss.git/commit

projects / dss.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 66cdd5b 46cbddf)

author	Andre Noll <maan@systemlinux.org>
	Sun, 16 Sep 2012 11:34:07 +0000 (13:34 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Sun, 16 Sep 2012 11:34:07 +0000 (13:34 +0200)
commit	6c76799c7334a12926dc1cf0c32670423cbc954f
tree	34ff91dd5479bf0ccf8f73010ba752a3df999f88	tree \| snapshot
parent	66cdd5bc99a53d2b408a6cdc2d501fe27f9db13b	commit \| diff
parent	46cbddf465bd66ba1d5c4bcc780ae0d65abd7f73	commit \| diff

Merge branch 't/rename_system_files'

Has been cooking for several weeks. The conflicts

daemon.c
exec.c
file.c
ipc.c
sig.c

are trivial and can be resolved easily.

daemon.c	diff1 \|	diff2 \|	blob \| history
df.c	diff1 \|	diff2 \|	blob \| history
dss.c	diff1 \|	diff2 \|	blob \| history
err.h	\|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
file.c	\|	diff2 \|	blob \| history
ipc.c	diff1 \|	diff2 \|	blob \| history
sig.c	\|	diff2 \|	blob \| history
str.c	\|	diff2 \|	blob \| history
tv.c	\|	diff2 \|	blob \| history

DSS - dyadic snapshot scheduler