fixed merge conflict
This commit is contained in:
11
ChangeLog
11
ChangeLog
@ -4,11 +4,18 @@
|
||||
|
||||
changes since 0.15.0
|
||||
===================================
|
||||
CHANGED 2015-10-28 improved the CLEANFILES for ROOT6.
|
||||
FIXED 2015-10-29 TMusrRunHeader didn't map a double vector properly into a
|
||||
string. The last element was a copy of the 2nd last instead
|
||||
if the proper last. This is now fixed. Fixed also some
|
||||
comment typo.
|
||||
FIXED 2015-11-11 Fixes the crash of Fourier if the maximal range given in the
|
||||
Fourier block is larger than the available.
|
||||
CHANGED 2015-11-15 removed unnecessary check form musredit_qt5 msr2data interface.
|
||||
|
||||
changes since 0.14.0
|
||||
===================================
|
||||
NEW 2015-10-26 added a first ported musredit version (Qt4 -> Qt5).
|
||||
NEW 2015-10-26 added a first ported musredit version (Qt4 -> Qt5). At the same
|
||||
the version has been incremented to 0.15.0.
|
||||
NEW 2015-09-24 adding a phase optimized real Fourier to musrFT. This is still VERY
|
||||
experimental, and hence only available from within musrFT. Eventually
|
||||
it should make its way into musrview as well. Furthermore the
|
||||
|
Reference in New Issue
Block a user