nixpkgs/pkgs/applications
Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
..
audio Merge branch 'staging' into v/modular 2014-08-31 12:23:18 +02:00
display-managers
editors ed: update to 1.10, working around *.lz problem 2014-08-30 23:00:58 +02:00
graphics gimp: Update to 2.8.14. 2014-08-27 18:46:24 +02:00
ike Fix various evaluation problems 2014-08-22 11:57:40 +02:00
inferno
misc Merge pull request #3813 from AndersonTorres/lilyterm 2014-08-29 01:30:35 +04:00
networking Merge recent master into staging 2014-08-30 10:04:02 +02:00
office Fix many package descriptions 2014-08-24 22:31:37 +02:00
science Merge branch 'staging' into v/modular 2014-08-31 12:23:18 +02:00
search
taxes
version-management Merge recent master into staging 2014-08-30 10:04:02 +02:00
video Merge pull request #3527 from AndersonTorres/mpv 2014-08-29 01:41:22 +04:00
virtualization Merge recent master into staging 2014-08-30 10:04:02 +02:00
window-managers Fix many package descriptions 2014-08-24 22:31:37 +02:00