Graham Christensen 43d38c0fea Merge pull request #18174 from acowley/ffmpeg-update-3.1.3 ... ffmpeg-full: 3.0.2 -> 3.1.3		2016-08-31 20:33:14 -04:00
..
applications	Merge branch 'emacs-packages'	2016-08-31 17:41:36 -05:00
build-support	Fix #4210: Remove builderDefs	2016-08-31 11:34:46 +02:00
data	oxygenfonts: corrected version	2016-08-31 07:59:01 +02:00
desktops	Merge branch 'master' into staging	2016-08-28 12:20:59 +01:00
development	Merge pull request #18174 from acowley/ffmpeg-update-3.1.3	2016-08-31 20:33:14 -04:00
games	fsg: disable format hardening	2016-08-29 17:01:03 +00:00
misc	linuxPackages.vhba: disable PIC hardening	2016-08-31 16:00:31 +03:00
os-specific	Merge pull request #18154 from womfoo/fix/mbpfan-buffer-overflow	2016-08-31 08:16:57 -04:00
servers	rethinkdb: 2.3.4 -> 2.3.5	2016-08-31 15:15:08 +02:00
shells	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
stdenv	Revert "make-bootstrap-tools.darwin: upgrade to llvm 3.8"	2016-08-29 16:19:36 +01:00
test
tools	nilfs-utils: Set dontPatchELF due to broken RPATH by patchelf	2016-09-01 01:48:49 +03:00
top-level	Merge pull request #18174 from acowley/ffmpeg-update-3.1.3	2016-08-31 20:33:14 -04:00