Go to file
Domen Kožar bb4d658f64 Merge branch 'master' into staging
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
doc doc: language-support: fix typo 2015-05-10 15:28:58 -07:00
lib z3 opt 2015-05-08 23:45:07 -07:00
maintainers Travis: disable tarball creating check, because travis can't handle it 2015-03-04 15:28:09 +01:00
nixos Merge branch 'master' into staging 2015-05-11 10:05:23 +02:00
pkgs Merge branch 'master' into staging 2015-05-11 10:05:23 +02:00
.gitignore gitignore: pkgs/development/libraries/qt-5/*/tmp/ 2015-02-21 11:39:20 -06:00
.travis.yml .travis.yml: add "sudo: required" to opt out of containers 2015-04-07 15:45:00 +02:00
.version release: 15.04 -> 15.05 2014-12-09 15:09:06 +01:00
COPYING
default.nix if we abort with too old Nix, hint docs 2015-01-21 21:41:40 +01:00
README.md add: logo 2015-04-06 20:10:25 +03:00