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	doc/contributing.xml: remove lies	2014-11-08 21:56:23 +01:00
default.nix	Nixpkgs manual: Add a Nix expression to build	2014-08-24 11:03:55 +02:00
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	Nixpkgs manual: Add a Nix expression to build	2014-08-24 11:03:55 +02:00
meta.xml	Document meta.branch	2014-10-07 16:23:27 +04:00
package-notes.xml
quick-start.xml	remove bittorrent package since it's obsolete	2014-09-05 22:49:31 +02:00
release-notes.xml
stdenv.xml	Fix copy&paste typo	2015-01-18 14:57:04 -05:00
style.css