nixpkgs/pkgs/tools
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
..
admin tigervnc: Drop dependency on libxcrypt 2013-01-28 17:19:03 +01:00
archivers Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
backup Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
bluetooth Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
cd-dvd * Add bchunk. 2012-06-17 03:36:22 +00:00
compression Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
filesystems Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00
graphics Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
inputmethods/fcitx add fcitx-4.2.7 2013-01-28 11:35:03 +08:00
misc file: bump from 5.11 to 5.12 2013-02-18 11:46:47 +01:00
networking Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00
package-management Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
security Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
system Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
text Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
typesetting texlive-moderncv: update to version 1.3.0 2013-02-11 21:15:17 +01:00
video add swfmill-0.3.2 2013-02-05 11:36:18 +08:00
virtualization ec2-ami-tools: Update to 1.4.0.9 2013-01-24 18:23:04 +01:00
X11 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00