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	ino: set six as dep	2014-08-27 19:02:05 +02:00
compilers	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
eclipse
guile-modules	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
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	intelgen4asm: Remove obsolete package	2014-08-07 01:32:43 +02:00
mobile	Some additional android runtimes.	2014-08-23 11:03:29 +02:00
ocaml-modules	Merge pull request #3849 from vbgl/cmdliner	2014-09-02 02:14:19 +04:00
perl-modules	Partially revert 7a45996 some more.	2014-07-28 20:52:47 +02:00
pharo/vm	Adding myself to the maintainers	2014-08-10 15:57:24 +02:00
python-modules	python-wrapper: fix wrapped argv[0] w/o sed, maybe	2014-09-02 01:31:49 +04:00
qtcreator	qtcreator: install desktop file	2014-08-02 21:11:36 +02:00
r-modules	RcmdrPlugin_ROC: remove broken package	2014-08-15 18:51:47 +02:00
ruby-modules
tools	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
web	Merge pull request #3337 from tailhook/node_permission_error	2014-08-23 12:38:35 +04:00