nixpkgs/pkgs/applications
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
..
audio Merge master into x-updates 2013-12-18 23:21:29 +01:00
display-managers slim: Work around broken PAM session handling 2013-10-15 13:23:40 +02:00
editors Merge master into x-updates 2013-12-18 23:21:29 +01:00
graphics Merge master into x-updates 2013-12-18 23:21:29 +01:00
ike add ike: IPSec client 2013-10-18 18:50:53 +02:00
misc calibre: update from 1.14.0 to 1.15.0 2013-12-18 18:18:20 +02:00
networking Merge master into x-updates 2013-12-18 23:21:29 +01:00
office impressive: update from 0.10.2 to 0.10.3 2013-12-18 18:18:32 +02:00
science jags: update from 2.2.0 to 3.4.0 2013-12-18 18:18:32 +02: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 gitAndTools.git: update from 1.8.5.1 to 1.8.5.2 2013-12-18 18:18:28 +02:00
video It is a first try to an expression for MPV video player. 2013-12-14 20:47:05 +01:00
virtualization Minor changes to Bochs expression. 2013-11-24 16:30:16 +01:00
window-managers Merge master into x-updates 2013-12-18 23:21:29 +01:00