Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/git-and-tools/default.nix pkgs/applications/version-management/git-and-tools/hub/default.nix pkgs/tools/audio/mpdcron/default.nix		2015-01-20 20:21:03 -05:00
..
applications	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2015-01-20 20:21:03 -05:00
build-support	fetchurl: add mirrors for OpenBSD (close #5551)	2015-01-20 16:24:00 +01:00
data	unifont: update from 5.1-20080907 to 7.0.06 (close #5748)	2015-01-20 16:38:49 +01:00
desktops	Merge pull request #5816 from AndersonTorres/xfce	2015-01-18 10:32:32 +01:00
development	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2015-01-20 20:21:03 -05:00
games	Merge pull request #5538 from ehmry/gnubg	2015-01-18 20:46:21 +01:00
misc	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2015-01-20 20:21:03 -05:00
os-specific	dmtcp: major update (close #5229)	2015-01-20 15:25:39 +01:00
servers	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2015-01-20 20:21:03 -05:00
shells	nixpkgs: remove redundant attribute sip	2014-12-23 19:37:21 +01:00
stdenv	stdenv: improve message on evaluation check (no hash changes)	2015-01-11 21:38:19 +01:00
test
tools	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2015-01-20 20:21:03 -05:00
top-level	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2015-01-20 20:21:03 -05:00