Vladimír Čunát be70104a3a Merge master into x-updates ... Conflicts (taken master): pkgs/development/compilers/llvm/3.4/llvm.nix		2014-02-04 22:00:09 +01:00
..
applications	gphoto2: update from 2.5.2 to 2.5.3	2014-02-04 21:58:25 +02:00
build-support	Do not assume a .rev attribute in available in src in maven-build.nix	2014-01-24 15:52:31 +01:00
data	Merge master into x-updates	2014-02-02 10:05:25 +01:00
desktops	KDE-4.11: update to 4.11.5	2014-02-04 21:58:25 +02:00
development	Merge master into x-updates	2014-02-04 22:00:09 +01:00
games	Adding missing unistd.h includes	2014-02-02 15:04:05 +04:00
misc	Merge pull request #1583 from MarcWeber/submit/drop-myhasktags	2014-01-25 04:24:12 -08:00
os-specific	Merge master into x-updates	2014-02-04 22:00:09 +01:00
servers	Merge master into x-updates	2014-02-02 10:05:25 +01:00
shells
stdenv	stdenv-linux: Fix binutils override	2014-01-28 15:23:57 +01:00
test
tools	upx: updating to 3.91.	2014-02-04 10:12:28 +01:00
top-level	Merge master into x-updates	2014-02-04 22:00:09 +01:00