nixpkgs/pkgs/applications
Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
..
audio Updated version of abcde to 2.5.4 2012-10-29 17:14:39 -07:00
display-managers/slim slim: Really update to 1.3.4 2012-08-17 11:33:59 -04:00
editors Merge branch 'master' into stdenv-updates. 2012-11-21 16:20:36 +01:00
graphics Update pqiv 2012-10-18 00:34:09 +04:00
misc st: update to 0.3 2012-11-21 10:12:01 +01:00
networking Merge branch 'master' into stdenv-updates. 2012-11-21 16:20:36 +01:00
office gnucash: Update to 2.4.11 2012-10-09 11:24:38 -04:00
science qfsm: add version 0.53.0 2012-11-11 20:32:41 +01:00
taxes * It's that time of year again. 2012-03-10 19:23:04 +00:00
version-management git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with current version of yesod 2012-11-21 12:30:54 +01:00
video Add key-mon 2012-11-11 18:13:04 +01:00
virtualization Merge pull request #157 from ecarreras/virtualbox-icons 2012-10-23 10:42:28 -07:00
window-managers i3status: update to 2.6 2012-11-17 02:10:21 +01:00