Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
3.3	gcc33: fix build on i686	2013-03-16 21:08:57 +01:00
3.4	gcc34: fix build on i686	2013-03-16 20:40:04 +01:00
4.2-apple64	gcc-apple: Mark as broken	2014-07-28 18:09:53 +02:00
4.3	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
4.4	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
4.5	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
4.6	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
4.8	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
4.9	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00