Eelco Dolstra 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs ...

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix

2013-08-21 17:05:30 +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

* Move all gcc versions to development/compilers/gcc.

2012-02-17 21:47:08 +00:00

4.2-apple64

Apple GCC: Fix `no-sys-dirs.patch' so that it applies.

2012-04-13 12:41:36 +00:00

4.3

unmaintain several packages

2013-08-16 23:45:01 +02:00

4.4

gcc-4.4: Fix build

2013-01-29 11:44:08 +01:00

4.5

Remove unnecessary parentheses around if conditions

2012-12-28 19:54:15 +01:00

4.6

gcc: Put *.la files in $lib/lib as well

2013-06-12 21:03:21 +02:00

4.7

gcc47: minor update to 4.7.3

2013-04-12 03:07:31 +02:00