Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix

2014-07-28 11:30:49 +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

gccApple: Patches for building on Mavericks

2014-06-21 11:32:37 -07:00

4.3

Merge branch 'origin/master' into stdenv.

2013-08-17 10:00:16 +02:00

4.4

gcc44: disable parallel build

2014-04-02 19:07:58 +02:00

4.5

gcc: Fix building 4.5 and 4.6

2014-01-13 20:53:06 +01:00

4.6

gcc: Add support for grsecurity

2014-05-15 13:25:47 +02:00

4.8

$xcodePath -> $SDKROOT

2014-07-24 21:53:46 +02:00

4.9

gcc49: maintenance update

2014-07-23 20:19:35 +02:00