Rickard Nilsson db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd ... Conflicts: pkgs/tools/networking/network-manager/default.nix		2013-01-03 13:44:47 +01:00
..
androidenv	- Updated android SDK to version 21	2012-12-20 14:04:52 +01:00
arduino	inotool: add avr-gcc-libc to inputs	2012-12-23 18:21:51 +02:00
compilers	gcc47: Adding gcc mode, cross-building.	2012-12-28 20:21:23 +01:00
eclipse
guile-modules
interpreters	lua-5.1: build liblua.so and install the pkgconfig file and the documentation	2012-12-25 11:25:56 +01:00
libraries	Merge remote-tracking branch 'upstream/master' into systemd	2013-01-03 13:44:47 +01:00
misc	AVR GCC: enable C++ support (makes it usable with Arduino)	2012-12-23 18:20:34 +02:00
ocaml-modules
perl-modules
python-modules
qtcreator
ruby-modules
tools	Updated sysprof from 1.0.12 to 1.2.0.	2012-12-27 01:02:06 +00:00
web