diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
commit | 9ee0a9df9bc69e72278b8d34093238428fa3ea82 (patch) | |
tree | 5b074e2ebbc2aba8c957753bfb9e549ed7689585 /pkgs/applications/science/logic | |
parent | 0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b (diff) | |
parent | 47288a22242b0cd554efc45d446e67573ca308f7 (diff) | |
download | nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.gz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.bz2 nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.lz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.xz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.zst nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.zip |
svn merge ^/nixpkgs/trunk
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
Diffstat (limited to 'pkgs/applications/science/logic')
0 files changed, 0 insertions, 0 deletions