All conflicts were resolved by taking the 2.7 side of the file,
since the gmoccapy release_notes stated that the same changes had
been made manually on the 2.7 side already
Conflicts:
src/emc/usr_intf/gmoccapy/gmoccapy.glade
src/emc/usr_intf/gmoccapy/gmoccapy.py
src/emc/usr_intf/gmoccapy/release_notes.txt
this includes the main script, some of the GUIs, the Python module,
the Tcl package, some image fies.
On a sim system, axis, tkemc, xemc all start. runtests pass.
a system with realtime wasn't yet tested.
packaging probably requires additional changes and was not yet tested.
There are various uses for "reset statistics". For example, after a user
determines that a specific action causes bad latency, he can hit "reset
statistics" and then go on testing the next suspected latency source.
Presumably this is easier and faster than closing and restarting the latency
test.
* Allow use of standard suffixes (e.g., ms, us, ns) when specifying period to te
st
* Allow testing of one-thread systems (specify "-" or 0 for other period)
