Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix		2014-07-22 11:00:00 +02:00
..
arduino
compilers	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
eclipse	ecj: Build on Darwin	2014-07-15 11:51:27 +02:00
guile-modules
interpreters
libraries	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
lisp-modules
misc
mobile	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
ocaml-modules
perl-modules
python-modules	added platform meta information to gpodder	2014-07-22 09:39:06 +02:00
qtcreator
r-modules
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
web