Peter Simons
|
2d326e5032
|
Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
pkgs/desktops/e18/enlightenment.nix
|
2014-08-04 16:51:47 +02:00 |
|
Mateusz Kowalczyk
|
7a45996233
|
Turn some license strings into lib.licenses values
|
2014-07-28 11:31:14 +02:00 |
|
Eelco Dolstra
|
40f7b0f9df
|
Another attempt to eradicate ensureDir
See c556a6ea46.
|
2014-06-30 14:56:10 +02:00 |
|
Lluís Batlle i Rossell
|
e9cbe5439e
|
Adding udptunnel
(Fixing a semicolon in pwnat expr too)
|
2013-05-08 22:51:39 +02:00 |
|