Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates ... Conflicts: pkgs/misc/maven/maven-1.0.nix pkgs/os-specific/linux/xf86-input-wacom/default.nix		2012-09-26 14:51:51 -04:00
..
compilers	ocaml: native code building for ARM on 3.12 and 4.00	2012-09-25 19:38:06 +02:00
eclipse
guile-modules
interpreters	Remove getConfig helper function	2012-09-19 13:56:56 -04:00
libraries	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
misc
ocaml-modules
perl-modules	DBD::SQLite: Don't link against /usr/lib/libsqlite3.dylib on Darwin	2012-09-12 12:33:03 -04:00
python-modules	Gajim: make OpenSSL code work	2012-09-13 18:03:50 +04:00
ruby-modules
tools	haskell-hslogger: update to version 1.2.1	2012-09-24 12:08:34 +02:00
web	build-node-package: make fewer assumptions about the name of the node tarball	2012-09-20 14:45:31 -04:00