lethalman c235eb2ffe Merge pull request #8920 from joachifm/fix-mozplugger ... mozplugger: 1.12.0 -> 2.1.6		2015-07-21 14:58:15 +02:00
..
applications	Merge pull request #8920 from joachifm/fix-mozplugger	2015-07-21 14:58:15 +02:00
build-support	build-maven: Add handling for snapshot version resolution	2015-07-20 09:19:12 -04:00
data	Merge branch 'master.upstream' into staging.upstream	2015-07-15 02:02:46 -07:00
desktops	Merge branch 'staging', discussion #8844	2015-07-19 08:09:29 +02:00
development	Merge pull request #8916 from joachifm/scsh	2015-07-21 14:27:27 +03:00
games	anki: fix build (ZHF)	2015-07-21 10:51:15 +02:00
misc	vimPlugins: add vim-multiple-cursors	2015-07-20 19:58:56 +00:00
os-specific	nixpkgs: pax-utils 1.0.3 -> 1.0.4	2015-07-20 13:52:34 -05:00
servers	nixpkgs: nginxUnstable 1.9.2 -> 1.9.3	2015-07-20 13:52:33 -05:00
shells	Merge branch 'master.upstream' into staging.upstream	2015-07-15 02:02:46 -07:00
stdenv	make bootstrap files buildable in sandbox	2015-07-10 14:00:47 -07:00
test
tools	aiccu: patch gnutls api change	2015-07-21 10:48:36 +02:00
top-level	Merge pull request #8920 from joachifm/fix-mozplugger	2015-07-21 14:58:15 +02:00