Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix		2013-06-13 17:12:43 +04:00
..
arduino
compilers	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
eclipse
guile-modules
interpreters	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
libraries	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
misc
mobile	titaniumsdk: Bump to version 3.1.1	2013-06-13 13:58:32 +02:00
ocaml-modules	New ocaml packages:	2013-06-07 21:40:38 +02:00
perl-modules	Module::Pluggable: Update to 4.8	2013-06-02 23:33:27 +02:00
python-modules	pygtk: propagate gtk (fixes solfege build)	2013-06-13 13:02:24 +02:00
qtcreator	qtcreator: Update to 2.7.1 and improvements (merge #579)	2013-06-01 12:53:17 +02:00
ruby-modules
tools	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
web	Plone: fix for 4.1	2013-06-10 20:59:58 +02:00