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
..
cinnamon-desktop.nix	add cinnamon-desktop (close #1314)	2013-12-02 21:21:45 +01:00
cinnamon-translations.nix
cjs.nix	cinnamon.cjs refactor: include version in name	2013-12-02 22:01:24 +01:00