Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:jcelaya/hdrmerge into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	DngFloatWriter.cpp
	Image.cpp
	ImageStack.cpp
	README.md
  • Loading branch information
@jcelaya
jcelaya committed May 18, 2014
2 parents 4c84c07 + 5ef6e32 commit 9fa68eb
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 9fa68eb

Please sign in to comment.