Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +02:00
..
arduino
compilers	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
coq-modules
eclipse
guile-modules
interpreters	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
libraries	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
lisp-modules	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
lua-modules
misc
mobile	titaniumenv: Use new xcodeenv simulate function in the example app	2014-10-15 17:28:52 +02:00
ocaml-modules	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
perl-modules
pharo
pure-modules/pure-gsl
python-modules
qtcreator
r-modules
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
web