9ee0a9df9b
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434 |
||
---|---|---|
.. | ||
astronomy | ||
biology | ||
chemistry/avogadro | ||
electronics | ||
geometry | ||
logic | ||
math | ||
misc |
9ee0a9df9b
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434 |
||
---|---|---|
.. | ||
astronomy | ||
biology | ||
chemistry/avogadro | ||
electronics | ||
geometry | ||
logic | ||
math | ||
misc |