Jonathan Glines 2784866ffd Merge branch 'master' into nitrogen. Added maintainer and license. ... Conflicts: pkgs/tools/X11/nitrogen/default.nix		2014-06-13 11:54:19 -06:00
..
applications	Merge pull request #2929 from pSub/org-mode	2014-06-13 15:47:41 +02:00
build-support	Add a function to overwrite just the version and sha256 by grepping them	2014-06-13 13:37:12 +04:00
data	Merge pull request #2741 from bergey/nafees	2014-05-28 08:37:29 +02:00
desktops	gvfs: add more supported protocols in gnome 3.10. Closes #2880	2014-06-11 23:10:40 +02:00
development	haskell-io-memoize: update to version 1.1.0.0	2014-06-13 15:41:26 +02:00
games	Oops, typespeed branch got merged somehow. Removed.	2014-06-13 11:37:05 -06:00
misc	lilypond: unbreak build by adding t1utils to buildInputs	2014-06-11 21:17:50 +02:00
os-specific	linux: Update to 3.12.22	2014-06-13 17:44:02 +02:00
servers	Add Squid 3.4.5 and enable its SSL features.	2014-06-13 17:41:42 +04:00
shells	fish: Fixed tab completion with sudo (close #2705)	2014-06-10 11:36:12 +02:00
stdenv	Change stdenv on darwin to not set NIX_ENFORCE_PURITY	2014-05-29 02:43:10 -05:00
test
tools	Merge branch 'master' into nitrogen. Added maintainer and license.	2014-06-13 11:54:19 -06:00
top-level	Merge branch 'master' into nitrogen. Added maintainer and license.	2014-06-13 11:54:19 -06:00