diff options
| author | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
| commit | 2d326e5032fda2210ff84118a526195f0a68bd24 (patch) | |
| tree | d3af676b9948c865f1e942e1db51862da5e19ad5 | |
| parent | 9253a95f6b3f65ecc701ebb10620acfb6d251f17 (diff) | |
| parent | b35770818d70924b2b71ae41ead270fe0be8c826 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
pkgs/desktops/e18/enlightenment.nix