Luca Bruno 83221f3886 Merge branch 'master' into staging ...

Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing

2014-11-08 15:56:40 +01:00

..

audio

Merge branch 'master' into staging

2014-11-08 15:56:40 +01:00

display-managers

Various SLIM themes, obtained from Sourceforge's SLIM website

2014-09-21 19:55:26 +01:00

editors

Merge branch 'master' into staging

2014-11-08 15:56:40 +01:00

gis

qgis: disable parallel building

2014-10-13 15:32:50 +02:00

graphics

imagemagick: Use --with-gcc-arch

2014-11-06 11:10:32 +01:00

inferno

Add missing 's' in remaining meta.maintainer(s) attrs

2014-07-22 23:49:21 +02:00

misc

Merge branch 'master' into staging

2014-11-08 15:56:40 +01:00

networking

Merge branch 'master' into staging

2014-11-08 15:56:40 +01:00

office

fix libreoffice build

2014-11-08 14:24:32 +01:00

science

Merge branch 'master' into staging

2014-11-08 15:56:40 +01:00

search

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

taxes

Add aangifte-2013

2014-03-01 16:54:16 +01:00

version-management

Merge branch 'master' into staging

2014-11-08 15:56:40 +01:00

video

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

virtualization

virtualbox: 4.3.16 -> 4.3.18

2014-11-03 21:47:59 +01:00

window-managers

Turn more licenses into lib.licenses style

2014-11-06 00:48:16 +00:00