aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into cudaJustin Lecher2012-11-251-1/+1
|\
| * Ignore .DS_StoreJustin Lecher2012-11-251-0/+2
* Adding ignores for MacJustin Lecher2012-11-231-0/+1