Vladimír Čunát 625f40151b Merge branch 'master' into x-updates ... Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix		2013-08-02 18:30:53 +02:00
..
applications	git-subtree: Remove	2013-08-01 16:37:36 +02:00
build-support	VM builds: Reduce kernel verbosity	2013-08-01 14:35:31 +02:00
data	make package use mirror:// for gnu, savannah and gnome repositories where possible	2013-07-14 05:23:06 +03:00
desktops	Fix a name collision between two distinct KDE wallpaper packages	2013-07-30 16:52:11 +02:00
development	Merge branch 'master' into x-updates	2013-08-02 18:30:53 +02:00
games	gtypist: update to 2.9.3 and fix the patch	2013-07-19 01:22:29 +02:00
lib	Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations	2013-08-02 09:39:20 +04:00
misc	wine: upgrade to 1.6 + latest gecko/mono extensions	2013-07-30 14:25:10 +02:00
os-specific	Move kernelExtraConfig to common-config.nix (for x86)	2013-08-01 14:35:31 +02:00
servers	Merge branch 'master' into x-updates	2013-08-02 18:30:53 +02:00
shells	ipython: update to version 0.13.2	2013-07-23 14:15:30 +02:00
stdenv	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
test
tools	Merge pull request #800 from edanaher/master	2013-08-02 02:32:19 -07:00
top-level	Merge branch 'master' into x-updates	2013-08-02 18:30:53 +02:00