Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ... Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix		2014-09-02 12:31:03 +02:00
..
arduino
compilers	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
eclipse
guile-modules
interpreters	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
libraries	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
lisp-modules	Update ASDF	2014-08-31 18:20:06 +04:00
misc
mobile
ocaml-modules	Merge pull request #3849 from vbgl/cmdliner	2014-09-02 02:14:19 +04:00
perl-modules
pharo/vm
python-modules	python-wrapper: fix wrapped argv[0] w/o sed, maybe	2014-09-02 01:31:49 +04:00
qtcreator
r-modules
ruby-modules
tools	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
web