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
..
arduino
compilers	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
coq-modules	coqPackages.QuickChick: New expression	2015-05-10 13:45:59 +02:00
eclipse
go-modules/generic
guile-modules
haskell-modules	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
interpreters	Update Regina/REXX	2015-05-10 13:46:30 +02:00
libraries	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
lisp-modules
lua-modules
misc
mobile
ocaml-modules
perl-modules
pharo	Pharo launcher 0.2.4 -> 0.2.7	2015-05-05 15:15:31 +02:00
pure-modules/pure-gsl
python-modules
qtcreator
r-modules
ruby-modules
tools	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
web