Michael Raskin 3b0720dbe4 Merge pull request #21473 from stepcut/netpbm-fix-libjpeg-paths ... netbpm: tell config.mk where to find JPEGLIB and JPEGHDR_DIR or jpegtopnm and friends will not be built		2016-12-30 22:04:56 +00:00
..
applications	Merge pull request #21207 from larkery/patch-1	2016-12-30 22:01:54 +00:00
build-support	Merge pull request #20767 from abbradar/debbuild	2016-12-30 21:57:19 +00:00
data	nerdfonts: 0.8.0 -> 1.0.0	2016-12-29 11:21:57 +01:00
desktops	kde5.plasma: 5.8.4 -> 5.8.5	2016-12-28 06:43:10 -06:00
development	Merge pull request #21456 from rycee/fix/clblas-cuda	2016-12-30 22:03:56 +00:00
games	Merge pull request #21496 from rardiol/opendungeons	2016-12-30 20:40:25 +00:00
misc	wineUnstable: 1.9.23 -> 2.0-rc2	2016-12-22 16:06:18 +02:00
os-specific	googleAuthenticator: 1.0 -> 1.03	2016-12-30 06:49:17 -05:00
servers	Merge branch 'roundup-15'	2016-12-28 21:04:51 -05:00
shells	zsh: 5.3 -> 5.3.1	2016-12-21 21:21:59 +01:00
stdenv	top-level: avoid another assert false while we're at it	2016-12-15 17:09:46 -05:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	Merge pull request #21473 from stepcut/netpbm-fix-libjpeg-paths	2016-12-30 22:04:56 +00:00
top-level	Merge branch 'staging'	2016-12-30 22:40:41 +01:00