diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-22 11:00:00 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-22 11:00:00 +0200 |
| commit | 7f410ef923b5959147e3902f727bb91b08543f72 (patch) | |
| tree | 5081fe1dbc7731c179ac8ab945e9ae2d9caefcfd /pkgs/applications/science/logic | |
| parent | f77abc8b7a8b4279258862a7b6d3810e73d4b092 (diff) | |
| parent | 7491fccfe65e204ecbc7addc7ccac7b6b69fe3c5 (diff) | |
| download | nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar.gz nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar.bz2 nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar.lz nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar.xz nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar.zst nixlib-7f410ef923b5959147e3902f727bb91b08543f72.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/misc/vim-plugins/default.nix
Diffstat (limited to 'pkgs/applications/science/logic')
0 files changed, 0 insertions, 0 deletions