Vladimír Čunát
eb2e46aab2
Merge branch 'master' into x-updates
Conflicts:
pkgs/applications/graphics/rawtherapee/default.nix
pkgs/applications/misc/blender/default.nix
pkgs/applications/networking/browsers/chromium/sources.nix
pkgs/os-specific/linux/kernel/linux-3.9.nix
pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
..
2013-01-28 17:19:03 +01:00
2012-08-10 15:02:19 +02:00
2013-03-30 21:05:15 +01:00
2012-12-13 17:51:03 +01:00
2012-03-07 22:20:23 +00:00
2013-03-23 15:58:14 +01:00
2013-03-26 01:16:15 +01:00
2012-06-22 14:36:11 -04:00
2013-04-04 16:27:57 +02:00
2010-06-22 19:49:06 +00:00
2013-04-04 21:43:40 +02:00
2012-12-04 12:02:36 +01:00
2013-03-15 12:41:01 +01:00
2013-03-23 15:58:14 +01:00
2013-01-13 11:33:45 +01:00
2013-02-23 23:49:48 +01:00
2013-02-05 20:35:39 +01:00
2013-02-26 00:41:10 +01:00