Vladimír Čunát ac6761c908 Merge master into stdenv-updates ... Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix		2014-01-20 19:39:28 +01:00
..
arduino
compilers	Merge master into stdenv-updates	2014-01-20 19:39:28 +01:00
eclipse
guile-modules
interpreters	Merge master into stdenv-updates	2014-01-20 19:39:28 +01:00
libraries	Merge master into stdenv-updates	2014-01-20 19:39:28 +01:00
lisp-modules
misc
mobile	Make iphone SDK 7.0 the default	2014-01-15 21:52:43 +01:00
ocaml-modules	Update OCaml library Camomile to version 0.8.5	2014-01-18 20:56:45 +00:00
perl-modules
python-modules	kde4(10).pykde4: fix build via downgrading sip and pyqt4	2014-01-16 08:59:31 +01:00
qtcreator
r-modules/generic
ruby-modules
tools	Merge master into stdenv-updates	2014-01-20 19:39:28 +01:00
web