Ian-Woo Kim 6d724303c3 Merge remote-tracking branch 'nixos/master' into proot ... Conflicts: pkgs/tools/system/proot/default.nix		2014-10-07 16:16:00 +02:00
..
applications	Gajim update	2014-10-07 16:23:28 +04:00
build-support
data
desktops
development	titaniumsdk: Add expression to 3.4.0 SDK	2014-10-07 15:31:11 +02:00
games
misc	cupsBjnp: update from 1.2.1 to 1.2.2, potentially fixes CVE-2014-2856	2014-10-06 22:02:40 +02:00
os-specific	bluez5: update from 5.23 to 5.24	2014-10-06 21:50:59 +02:00
servers	couchdb: update from 1.6.0 to 1.6.1	2014-10-06 22:03:42 +02:00
shells
stdenv
test
tools	Merge remote-tracking branch 'nixos/master' into proot	2014-10-07 16:16:00 +02:00
top-level	Gajim update	2014-10-07 16:23:28 +04:00