Antono Vasiljev d4fc33b13a Merge branch 'master' into arduino ... Conflicts: pkgs/top-level/all-packages.nix		2012-12-23 00:17:23 +02:00
..
applications	i3: update to 4.4	2012-12-22 17:21:17 +01:00
build-support	More specific tracing of a relatively tricky replace once; account for default.nix being present everywhere.	2012-12-22 14:14:48 +04:00
data	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
desktops	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
development	Merge branch 'master' into arduino	2012-12-23 00:17:23 +02:00
games	scid: New package, version 4.3.	2012-12-12 12:36:20 +01:00
lib	D'oh	2012-12-20 00:52:51 -05:00
misc	Wine: update to 1.5.20	2012-12-22 14:54:22 +04:00
os-specific	Linux 3.7.1	2012-12-17 17:45:01 -05:00
servers	postgresql: Add version 9.2	2012-12-19 13:51:28 +01:00
shells	bash-completion: remove NixOS-specific patch	2012-10-16 18:26:02 +02:00
stdenv	Remove support for the obsolete powerpc-darwin and i686-darwin platforms	2012-11-29 14:10:49 +01:00
test	Add a new way to handle option sets.	2008-08-05 17:16:35 +00:00
tools	Add unionfs-fuse meta	2012-12-16 16:42:45 -05:00
top-level	Merge branch 'master' into arduino	2012-12-23 00:17:23 +02:00