Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/redmine/default.nix pkgs/development/interpreters/ruby/gem.nix pkgs/development/interpreters/ruby/generated.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/tools/vagrant/default.nix pkgs/servers/consul/default.nix		2014-12-28 14:29:52 -05:00
..
acoustid-fingerprinter
gvolicon	Fixed many descriptions	2014-11-11 14:36:34 +01:00
liquidsoap	initial liquidsoap package expression	2014-11-20 17:34:14 -05:00
mpdcron	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2014-12-28 14:29:52 -05:00
pa-applet
pasystray	wrap pasystray to provide XDG_DATA_DIRS so tray icon displays correctly	2014-12-06 15:50:26 -07:00
pnmixer	pnmixer: cleanup	2014-08-25 10:04:49 +02:00
volumeicon	Fixed many descriptions	2014-11-11 14:36:34 +01:00