diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-11-25 17:44:26 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-11-25 17:44:26 +0100 |
| commit | 348d18efa7374599396a84a8100b12d1b5b7bc4b (patch) | |
| tree | 752d2e1816a7e9d35f7b0cdb46dada0faa25ac51 /.gitignore | |
| parent | Correcting whitespace problem (diff) | |
| parent | Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci; github.c... (diff) | |
| download | sci-348d18efa7374599396a84a8100b12d1b5b7bc4b.tar.gz sci-348d18efa7374599396a84a8100b12d1b5b7bc4b.tar.bz2 sci-348d18efa7374599396a84a8100b12d1b5b7bc4b.zip | |
Merge branch 'master' into cuda
* master:
Ignore .DS_Store
fixing manifest
removed g-cran, broken
Re-manifesting
dev-cpp/eigen: Version bump
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 496ee2ca6..e43b0f988 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.DS_Store
\ No newline at end of file +.DS_Store |