Merge branch 'master' of https://github.com/t20100/pymca
Freshly regenerated code.
Add Json-RPC 1D plugin
Array indexing in MaskScatterWidget
support color for selections + color as numpy.ndarray
Merge remote-tracking branch 'upstream/master'