9 commits

Author	SHA1	Message	Date
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
Vladimír Čunát	3a5f9ecd70	cinnamon.cjs refactor: include version in name	2013-12-02 22:01:24 +01:00
Roelof Wobben	81460560c3	add cinnamon-desktop (close #1314) ... Reviewed and refactored by @vcunat.	2013-12-02 21:21:45 +01:00
Roelof Wobben	28d24ea4eb	cinnamon-transalations working	2013-12-02 13:25:38 +01:00
Roelof Wobben	f3536a0dcb	broken translation files	2013-12-02 09:24:08 +01:00
Roelof Wobben	808603852a	cjs is working with the new mozjs185	2013-11-30 22:46:39 +01:00
Roelof Wobben	f668fd37df	broken patch	2013-11-30 22:46:39 +01:00
Roelof Wobben	43b894a5b3	solved the gobject error message	2013-11-30 22:46:39 +01:00
Roelof Wobben	34df0b45ba	GJS error	2013-11-30 22:46:38 +01:00