Domen Kožar 4aa3eec330 Merge branch 'master' into staging ... Conflicts: pkgs/development/libraries/fontconfig/default.nix		2014-12-07 14:02:48 +01:00
..
arduino	ino: Use picocom rather than minicom	2014-11-29 17:55:41 +00:00
compilers	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
coq-modules	coq-flocq: license	2014-12-07 13:14:33 +01:00
eclipse
guile-modules
interpreters	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
libraries	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
lisp-modules	Add CL-SMTP package	2014-11-16 19:57:12 +03:00
lua-modules
misc
mobile	add android build tools to $PATH	2014-11-24 00:47:57 -08:00
ocaml-modules	lablgl: place libs correctly	2014-11-29 14:21:16 +01:00
perl-modules	slic3r: Bump to 1.2.1	2014-11-15 19:22:59 +01:00
pharo	Update pharo vm	2014-12-04 16:41:20 +01:00
pure-modules/pure-gsl
python-modules	Merge pull request #5007 from nbp/bugwarrior	2014-12-01 22:20:17 +01:00
qtcreator
r-modules	Mark R packages h2o, jvmr, and qtbase as broken.	2014-12-04 15:00:54 +01:00
ruby-modules
tools	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
web