Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master ... This one was already merged into release-16.09, so let's not have the stable branch is ahead of master and confuse things. In addition to that, currently we have an odd situation that master has less things actually finished building than in staging. Conflicts: pkgs/data/documentation/man-pages/default.nix		2016-09-03 01:02:51 +03:00
..
languages-frameworks	pythonPackages: use mkPythonDerivation	2016-09-01 16:16:31 +02:00
old	Fix #4210: Remove builderDefs	2016-08-31 11:34:46 +02:00
coding-conventions.xml	nixpkgs-doc: add patches to coding conventions	2016-08-06 09:05:23 +09:00
configuration.xml
contributing.xml
default.nix
functions.xml
introduction.md
manual.xml
meta.xml
multiple-output.xml	docdev -> devdoc	2016-09-01 11:07:23 +02:00
package-notes.xml
quick-start.xml
release-notes.xml
stdenv.xml	Merge pull request #9607 from nckx/update-doc	2016-08-31 10:02:16 +02:00
style.css
submitting-changes.xml