Pascal Wittmann 0baac649aa Merge pull request #3188 from vbgl/merlin ... Adds merlin		2014-08-01 13:39:27 +02:00
..
applications	i3: Remove CarpAlways from buildInputs.	2014-08-01 11:19:06 +02:00
build-support
data	source-han-sans: fixed package name	2014-07-30 16:27:20 +02:00
desktops	xfce4-appfinder: update 4.9.4 -> 4.10.1	2014-07-31 16:30:04 +02:00
development	Merge pull request #3188 from vbgl/merlin	2014-08-01 13:39:27 +02:00
games	scummvm: version bump to 1.7	2014-07-30 20:26:29 +02:00
misc	Revert "Remove obsolete jackaudio version 1."	2014-07-31 12:52:29 +02:00
os-specific	Revert "Remove obsolete jackaudio version 1."	2014-07-31 12:52:29 +02:00
servers	Revert "Remove obsolete jackaudio version 1."	2014-07-31 12:52:29 +02:00
shells	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
stdenv
test
tools	Merge branch 'i3-tests'.	2014-08-01 05:51:57 +02:00
top-level	Merge pull request #3188 from vbgl/merlin	2014-08-01 13:39:27 +02:00