Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/git-and-tools/default.nix pkgs/applications/version-management/git-and-tools/hub/default.nix pkgs/tools/audio/mpdcron/default.nix		2015-01-20 20:21:03 -05:00
..
old	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
coding-conventions.xml
contributing.xml
default.nix
introduction.xml
language-support.xml	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2014-12-28 14:29:52 -05:00
manual.xml
meta.xml
package-notes.xml
quick-start.xml
release-notes.xml
stdenv.xml	Fix copy&paste typo	2015-01-18 14:57:04 -05:00
style.css