ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity
c514ee974a
nixpkgs/pkgs
History
Shea Levy c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates 
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
2012-07-14 14:24:27 -04:00
..
applications Build the LinuxSampler LV2 plugin 2012-07-14 18:50:32 +02:00
build-support Merge remote-tracking branch 'upstream/master' into x-updates 2012-07-14 14:24:27 -04:00
data Merge remote-tracking branch 'upstream/master' into x-updates 2012-07-14 14:24:27 -04:00
desktops gtkglextmm: add version 1.2.0 2012-07-02 17:13:36 +02:00
development Merge remote-tracking branch 'upstream/master' into x-updates 2012-07-14 14:24:27 -04:00
games kobodeluxe: fix compilation errors. 2012-07-12 23:42:20 +02:00
lib Fix the "path" option type 2012-07-12 11:54:05 -04:00
misc wine: update to version 1.5.5 2012-07-02 16:53:51 +02:00
os-specific Merge remote-tracking branch 'upstream/master' into x-updates 2012-07-14 14:24:27 -04:00
servers Merge remote-tracking branch 'upstream/master' into x-updates 2012-07-14 14:24:27 -04:00
shells * Bash 4.2.24. 2012-04-03 11:48:31 +00:00
stdenv * Sync with the trunk. 2012-05-02 13:19:07 +00:00
test
tools Merge remote-tracking branch 'upstream/master' into x-updates 2012-07-14 14:24:27 -04:00
top-level Merge remote-tracking branch 'upstream/master' into x-updates 2012-07-14 14:24:27 -04:00