Skip to content

Commit

Permalink
Merge branch 'db2' of github.com:akashihi/soci into db2
Browse files Browse the repository at this point in the history 
Conflicts:
	src/cmake/SociDependencies.cmake
  • Loading branch information
Denis Chapligin committed Feb 20, 2013
2 parents 6985c8b + e3a0428 commit aa275f9
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit aa275f9

Please sign in to comment.