aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci into ↵Guillaume Horel2011-06-301-0/+42
guillaume Conflicts: sci-mathematics/scilab/Manifest