mornfall d74c40d6bf Merge pull request #1848 from thoughtpolice/cb0cat ... cb0cat: version 20131216153906		2014-02-27 19:50:40 +01:00
..
applications	Merge pull request #1822 from thoughtpolice/spark	2014-02-27 19:47:53 +01:00
build-support	vmTools: Hook in runInWindowsVM function.	2014-02-26 06:21:48 +01:00
data	Merge master into x-updates	2014-02-20 20:55:31 +01:00
desktops	xfce4-power-manager: update patch hash (no idea what's changed)	2014-02-22 18:20:44 +01:00
development	androidsdk: only create AVD if needed + some fixes	2014-02-27 19:26:18 +01:00
games
misc	wineUnstable: update from 1.7.11 to 1.7.12	2014-02-14 21:16:22 +02:00
os-specific	Merge pull request #1824 from thoughtpolice/ktap	2014-02-27 19:48:29 +01:00
servers	add serfdom (close #1672)	2014-02-27 19:18:28 +01:00
shells	fish: Fix propagatedBuildInputs and other assorted changes	2014-02-15 12:17:06 +01:00
stdenv
test
tools	Merge pull request #1848 from thoughtpolice/cb0cat	2014-02-27 19:50:40 +01:00
top-level	Merge pull request #1848 from thoughtpolice/cb0cat	2014-02-27 19:50:40 +01:00