Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates ... Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix		2013-03-02 10:41:53 +01:00
..
arduino	inotool: add avr-gcc-libc to inputs	2012-12-23 18:21:51 +02:00
compilers	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
eclipse	update ecj to 3.7.2	2012-08-25 19:39:19 +02:00
guile-modules
interpreters	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
libraries	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
misc	AVR GCC: enable C++ support (makes it usable with Arduino)	2012-12-23 18:20:34 +02:00
mobile	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
ocaml-modules	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
perl-modules	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
python-modules	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-22 23:23:53 +01:00
qtcreator	qtcreator: Build QmlDesigner Plugin	2012-11-27 23:13:18 +01:00
ruby-modules
tools	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
web	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00