Merge branch 'master' of https://github.com/t20100/pymca
Convert from BGRA to RGBA.
Update to current fisx version.
Modify doc strings.
Import from actual location.
Add intermediate slot for clicked signal.
Correct title bug.
Correct import bug.
Correct import bug.
Modify index handling.
Preliminary patch to deal with files with many (more than 2500) scans.
Change default LabelNames key content.
Prepare for future addition of mask functionality.
GL backend working with multiple GL contexts
Zoom wheel only active in idle, update state machine
Texture: typo, VBO: add attrib class
Add line and scatter plot base class
GL backend: use GLLinePlot
Merge remote-tracking branch 'upstream/master'