Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. ...

Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix

2013-12-04 18:33:52 +01:00

..

audio

Merge remote-tracking branch 'origin/master' into stdenv-updates.

2013-12-04 18:33:52 +01:00

display-managers

slim: Work around broken PAM session handling

2013-10-15 13:23:40 +02:00

editors

Merge remote-tracking branch 'origin/master' into stdenv-updates.

2013-12-04 18:33:52 +01:00

graphics

Merge remote-tracking branch 'origin/master' into stdenv-updates.

2013-12-04 18:33:52 +01:00

ike

add ike: IPSec client

2013-10-18 18:50:53 +02:00

misc

Merge remote-tracking branch 'origin/master' into stdenv-updates.

2013-12-04 18:33:52 +01:00

networking

Merge remote-tracking branch 'origin/master' into stdenv-updates.

2013-12-04 18:33:52 +01:00

office

Ledger3: Update to latest git.

2013-11-27 01:53:06 +01:00

science

Updating EKRHuper

2013-11-25 10:59:35 +04: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 'origin/master' into stdenv-updates.

2013-12-04 18:33:52 +01:00

video

keymon: update from 1.13 to 1.16

2013-12-04 06:44:19 +02:00

virtualization

Minor changes to Bochs expression.

2013-11-24 16:30:16 +01:00

window-managers

Merge pull request #1245 from nathanielbaxter/dev/openbox

2013-11-21 00:34:19 -08:00