aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into cudaJustin Lecher2012-11-251-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | * master: Ignore .DS_Store fixing manifest removed g-cran, broken Re-manifesting dev-cpp/eigen: Version bump Conflicts: .gitignore
| * Ignore .DS_StoreJustin Lecher2012-11-251-0/+2
|
* Adding ignores for MacJustin Lecher2012-11-231-0/+1
.DS_Store