philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs/applications
History
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
..
audio Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
display-managers/slim
editors Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
graphics Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
misc Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
networking Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
office Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
science Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
taxes
version-management Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
video Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
virtualization Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
window-managers Merge pull request #221 from Eelis/master 2012-12-27 05:31:22 -08:00