Franz Pletz 6303b6eb1c czmq: fix bad merge ... 9db5362270 vs. 9e211203da		2016-08-23 20:02:38 +02:00
..
applications	Merge branch 'master' into staging	2016-08-23 18:50:06 +01:00
build-support	Merge branch 'hardened-stdenv' into staging	2016-08-23 18:50:10 +01:00
data	Merge pull request #17847 from DamienCassou/cantarell-0.0.25	2016-08-23 10:51:26 +02:00
desktops	Merge branch 'master' into staging	2016-08-23 18:50:06 +01:00
development	czmq: fix bad merge	2016-08-23 20:02:38 +02:00
games	Merge branch 'master' into staging	2016-08-23 18:50:06 +01:00
misc	Merge branch 'master' into staging	2016-08-23 18:50:06 +01:00
os-specific	Merge branch 'master' into staging	2016-08-23 18:50:06 +01:00
servers	Merge branch 'master' into staging	2016-08-23 18:50:06 +01:00
shells	Merge branch 'master' into hardened-stdenv	2016-08-13 16:59:55 +02:00
stdenv	Partially revert "make-bootstrap-tools.darwin: upgrade to llvm 3.8"	2016-08-21 15:26:51 +01:00
test
tools	Merge branch 'hardened-stdenv' into staging	2016-08-23 18:50:10 +01:00
top-level	Merge branch 'hardened-stdenv' into staging	2016-08-23 18:50:10 +01:00