Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates. ... There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix, which I resolved to the best of my knowledge. I'd appreciate if some of the ruby gurus could have a look at the outcome of my merge, though.		2013-06-11 12:11:25 +02:00
..
audio	pianobar: Change license and clean up code	2013-06-08 14:13:36 -05:00
display-managers
editors	Merge pull request #568 from MarcWeber/submit/vim-multiple-version-and-plugins	2013-06-10 23:06:56 -07:00
graphics	Merge pull request #551 from MarcWeber/submit/alchemy	2013-06-03 15:45:12 -07:00
misc	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
networking	firefox-21: fix search box not working when built on xulrunner	2013-06-11 09:32:39 +02:00
office	libreoffice: update from 3.6.2.2 to 3.6.6.2	2013-05-13 16:07:01 +02:00
science	Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.	2013-06-07 03:15:45 +03:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes	aangifte2012: preload library which seems needed	2013-04-05 00:34:14 +02:00
version-management	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
video	kdenlive+mlt: enabling some subcomponents, parallel builds	2013-06-05 00:30:44 +02:00
virtualization	virtualbox+guest: Update to new upstream v4.2.12.	2013-04-13 10:31:36 +02:00
window-managers	openbox: upgrade to 3.5.0	2013-05-13 10:33:31 +08:00