Fix: this fixes #1

wxPyphant now shuts down without throwing an exception when the recipe
creation is canceled
Merge pull request #5 from aheld84/master

Fix: fixes #1
Fix: fixes #3

fixes #3 by reintroducing Emd5Src worker and
deleting FCSource, SCSource workers and the related gui stuff
Merge remote-tracking branch 'SGWissInfo/master'
Merge pull request #6 from aheld84/master

Fix: fixes #3
Cosm: cleaned up code in wxPyphantApplication

* removed old comments
* split long lines
Cosm: changed loglevel for exceptions

set loglevel from debug to error
Enh: implements #2

implements #2
Merge pull request #7 from aheld84/master

closes #2
Design: removes circular dep. between pyphant and tools

moved Emd5Src from tools to pyphant, solving the circular
dependency between tools and pyphant
Design: removes circular dep. between pyphant and OSC

moved method 'fixedPoints' from OSC.TestExtremumFinder
to pyphant.tests.Helpers
Design: removes circular dep. between pyphant and fmfile

moved IO stuff from fmfile to pyphant.core
visualizer and worker are still in fmfile
Design: removes circular dep. between pyphant and ImageProcessing

moves image loading mechanism to pyphant.core
replaces ThresholdingWorker in pyphant.tests by dummy Workers
Merge pull request #9 from aheld84/master

Fix: fixes #4
Fix: fixes #8

removed mainloop from FMFWriter
Merge pull request #11 from aheld84/master

Fix: fixes #8
Enh: Allow for slices to be used with sample containers.

Signed-off-by: Klaus Zimmermann <klaus.zimmermann@physik.uni-freiburg.de>
Merge pull request #12 from zklaus/master

Allow for slices in sample containers
Fix: removes svn related stuff from setup.cfg

removes the

tag_svn_revision = 1

line from all setup.cfg files
Merge commit 'v1.0b1'

Conflicts:
	src/pyphant/setup.cfg
	src/workers/ImageProcessing/setup.cfg
	src/workers/OSC/setup.cfg
	src/workers/Statistics/setup.cfg
	src/workers/fmfile/setup.cfg
	src/workers/tools/setup.cfg