3 Commits (8ba06a38c153ea15b54d66f23ef3521e427ed3f9)

Author	SHA1	Message	Date
Ludovic Courtès	9ba0b8d3d0	daemon: Flush upon '\r' when reading the substituter's stderr. ... * nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter): Flush when the line contains '\r'.	2015-02-07 23:16:56 +01:00
Ludovic Courtès	15ddeff532	Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch 'nix'.	2015-01-04 23:27:34 +01:00
Ludovic Courtès	36457566f9	Merge branch 'nix' into 'master'.	2014-12-19 22:47:37 +01:00