[OpenSPIM] New rebase

Johannes Schindelin schindelin at wisc.edu
Wed Jun 12 21:51:59 CDT 2013


Hi Luke,

I pushed a new topic branch (as threatened) with the first steps to get us
up-to-date with upstream Micro-Manager.

If I did not forget, I marked all problematic commits with "TODODODO!" in
the commit subject. Note that I removed four commits marked "TODOs", or
"to-undo".

The most problematic remaining issue is most likely:

	https://github.com/openspim/micromanager/commit/4ea03944dd485

According to

	http://valelab.ucsf.edu/~MM/MMwiki/index.php/Building_MM_on_Windows

it should still build with Visual Studio 2010 Express, though.

Ciao,
Johannes




More information about the OpenSPIM mailing list