John Ericson 446cb32ea1 haskell generic-builder: Remove merge conflict ... I forgot this in 17316643fd		2018-05-23 10:11:03 -04:00
..
arduino	platformio: add git to chroot so it is usable by platformio command	2018-05-05 02:41:10 -04:00
beam-modules
bower-modules/generic
compilers	Merge remote-tracking branch 'upstream/master' into staging	2018-05-23 09:40:37 -04:00
coq-modules	coqPackages.tlc: 20171206 -> 20180316 (#40927)	2018-05-22 20:55:57 +02:00
dotnet-modules/patches
em-modules/generic
go-modules
guile-modules	tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux	2018-04-30 18:08:48 -05:00
haskell-modules	haskell generic-builder: Remove merge conflict	2018-05-23 10:11:03 -04:00
idris-modules	idrisPackages.vdom: init at 0.6.0	2018-05-08 11:41:52 +02:00
interpreters	Merge remote-tracking branch 'upstream/master' into staging	2018-05-22 17:48:29 +03:00
java-modules
libraries	Merge remote-tracking branch 'upstream/master' into staging	2018-05-23 09:40:37 -04:00
lisp-modules	asdf: 3.3.1 -> 3.3.2	2018-05-07 05:20:34 -07:00
lua-modules
misc	avrgcc: 7.3.0 -> 8.1.0	2018-05-07 05:59:21 -07:00
mobile	androidndk: Fix usage as crossSystem	2018-05-17 17:22:27 +02:00
node-packages	ios-rebuild: Unbreak build	2018-05-16 14:28:23 -04:00
ocaml-modules	ocamlPackages.imagelib: init at 20171028 (#40910)	2018-05-23 10:33:26 +02:00
perl-modules	perlPackages.BerkeleyDB: fix db dependency	2018-05-22 17:49:04 +03:00
pharo
pure-modules
python-modules	Merge remote-tracking branch 'upstream/master' into staging	2018-05-23 09:40:37 -04:00
r-modules	rPackages.JuniperKernel: fix non-Darwin build	2018-05-15 17:50:11 +09:00
ruby-modules	Merge branch 'staging' into fix-ncurses-darwin-extensions	2018-05-02 15:40:38 -05:00
tools	Merge remote-tracking branch 'upstream/master' into staging	2018-05-23 09:40:37 -04:00
web	Merge remote-tracking branch 'upstream/master' into staging	2018-05-21 20:21:48 -04:00