Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
audio	fix bad "licence" names	2013-07-04 18:16:34 +02:00
display-managers	libpng: keep versioning in all-packages.nix, not in individual expressions	2013-06-27 21:35:21 +02:00
editors	kile: minor update	2013-07-05 14:45:58 +02:00
graphics	darktable: Update to 1.2.2	2013-07-02 18:38:56 +02:00
misc	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
networking	Adding a wrapper for sflphone-gnome (to find gtk3 schema files)	2013-07-06 14:34:15 +02:00
office	keep lcms versioning in all-packages.nix	2013-07-01 07:52:13 +02:00
science	fix bad "licence" names	2013-07-04 18:16:34 +02:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes	aangifte2012: preload library which seems needed	2013-04-05 00:34:14 +02:00
version-management	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
video	Merge pull request #669 from iyzsong/kmplayer	2013-07-01 02:54:13 -07:00
virtualization	qemu: Allow building only the x86 emulator	2013-07-04 18:27:26 +02:00
window-managers	i3lock: updating to 2.5	2013-07-08 01:18:12 +02:00