| 1 |
commit: 348d18efa7374599396a84a8100b12d1b5b7bc4b |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 25 16:44:26 2012 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 25 16:44:26 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=348d18ef |
| 7 |
|
| 8 |
Merge branch 'master' into cuda |
| 9 |
|
| 10 |
* master: |
| 11 |
Ignore .DS_Store |
| 12 |
fixing manifest |
| 13 |
removed g-cran, broken |
| 14 |
Re-manifesting |
| 15 |
dev-cpp/eigen: Version bump |
| 16 |
|
| 17 |
Conflicts: |
| 18 |
.gitignore |
| 19 |
|
| 20 |
|
| 21 |
.gitignore | 2 +- |
| 22 |
app-portage/g-cran/ChangeLog | 20 ----- |
| 23 |
app-portage/g-cran/g-cran-9999.ebuild | 25 ------ |
| 24 |
app-portage/g-cran/metadata.xml | 10 --- |
| 25 |
dev-cpp/eigen/ChangeLog | 6 ++ |
| 26 |
dev-cpp/eigen/Manifest | 2 +- |
| 27 |
dev-cpp/eigen/eigen-3.0.6-r1.ebuild | 84 -------------------- |
| 28 |
.../{eigen-3.1.1-r1.ebuild => eigen-3.1.2.ebuild} | 0 |
| 29 |
dev-cpp/eigen/metadata.xml | 14 ++-- |
| 30 |
dev-java/flexdock/Manifest | 2 +- |
| 31 |
sci-astronomy/scamp/Manifest | 2 +- |
| 32 |
sci-astronomy/sextractor/Manifest | 2 +- |
| 33 |
sci-astronomy/skymaker/Manifest | 2 +- |
| 34 |
sci-astronomy/stuff/Manifest | 2 +- |
| 35 |
14 files changed, 20 insertions(+), 153 deletions(-) |
| 36 |
|
| 37 |
diff --cc .gitignore |
| 38 |
index 496ee2c,9bea433..e43b0f9 |
| 39 |
--- a/.gitignore |
| 40 |
+++ b/.gitignore |
| 41 |
@@@ -1,1 -1,2 +1,1 @@@ |
| 42 |
- .DS_Store |
| 43 |
- |
| 44 |
+ .DS_Store |
Archives