Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates ... Conflicts (just different styles, same semantics): pkgs/development/libraries/libusb1/default.nix		2013-12-07 14:17:16 +01:00
..
core	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
desktop	add introspection into GTK libs (part of #517)	2013-08-04 21:11:24 +02:00
default.nix	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00