Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/redmine/default.nix pkgs/development/interpreters/ruby/gem.nix pkgs/development/interpreters/ruby/generated.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/tools/vagrant/default.nix pkgs/servers/consul/default.nix		2014-12-28 14:29:52 -05:00
..
old	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
coding-conventions.xml	doc: document current conventions on package naming	2014-02-23 08:00:59 +01:00
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	* Sync CSS with the Nix manual.	2012-05-11 21:42:00 +00:00
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	splashutils: Remove	2013-09-26 18:03:43 +02:00
quick-start.xml	remove bittorrent package since it's obsolete	2014-09-05 22:49:31 +02:00
release-notes.xml	Fix trivial spelling mistake in docs	2014-06-13 11:11:27 +01:00
stdenv.xml	Initial documentation for Python packaging. Feedback welcome.	2014-11-13 21:31:27 +01:00
style.css	* Sync CSS with the Nix manual.	2012-05-11 21:42:00 +00:00