Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/openmp' into openmp
Browse files Browse the repository at this point in the history 
Conflicts:
	src/shogun/lib/SGReferencedData.h
  • Loading branch information
@lisitsyn
lisitsyn committed Aug 16, 2012
2 parents f8cedcf + f517565 commit 74a774c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 74a774c

Please sign in to comment.