nixpkgs/pkgs/applications
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
..
audio 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
display-managers
editors Merge branch 'master' into x-updates 2013-06-05 12:59:47 +02:00
graphics Merge branch 'master' into x-updates 2013-06-05 12:59:47 +02:00
misc Merge remote-tracking branch 'hydra/master' into x-updates 2013-06-08 15:41:39 +00:00
networking Merge remote-tracking branch 'hydra/master' into x-updates 2013-06-08 15:41:39 +00:00
office Revert "Fixing LibreOffice configure for now" 2013-06-05 22:51:21 +02:00
science Merge remote-tracking branch 'hydra/master' into x-updates 2013-06-08 15:41:39 +00: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 remote-tracking branch 'hydra/master' into x-updates 2013-06-08 15:41:39 +00:00
video Merge branch 'master' into x-updates 2013-06-05 12:59:47 +02:00
virtualization virtualbox+guest: Update to new upstream v4.2.12. 2013-04-13 10:31:36 +02:00
window-managers ReRevert Merge x-updates into master 2013-05-29 23:25:02 +02:00