Peter Simons cc3e61006f Merge pull request #20811 from Profpatsch/hdbc-odbc-haddock ... haskellPackages.HDBC-odbc: remove haddock fix again		2016-11-30 14:00:30 +01:00
..
applications	Merge pull request #20799 from vbgl/camlp5-6.17	2016-11-30 10:32:00 +01:00
build-support	stdenv moveToOutput: move even broken symlinks	2016-11-26 12:32:15 +01:00
data	xits-math: build from source	2016-11-24 01:17:54 +03:00
desktops	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
development	Merge pull request #20811 from Profpatsch/hdbc-odbc-haddock	2016-11-30 14:00:30 +01:00
games	rogue: Add alternative source archive URLs.	2016-11-26 19:24:01 +00:00
misc	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
os-specific	linux: 3.12.67 -> 3.12.68	2016-11-29 17:40:17 -05:00
servers	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
shells	oh-my-zsh: 2016-11-03 -> 2016-11-16	2016-11-19 20:57:54 -05:00
stdenv	allowUnfree: mention the solution that works for nix-shell as well	2016-11-16 15:14:19 +01:00
test
tools	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
top-level	Merge pull request #20152 from igsha/fix-mezzanine	2016-11-30 10:43:34 +01:00