Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed ControlObjectThreadMain instances to ControlObjectThread where no direct connection is used. #43

Merged
merged 7 commits into from
Oct 11, 2013
Merged

Changed ControlObjectThreadMain instances to ControlObjectThread where no direct connection is used. #43

merged 7 commits into from
Oct 11, 2013

Commits on Jul 11, 2013

  1. Changed some ControlObjectThreadMain instances to ControlObjectThread if 

    no direct connection is used.
    @daschuer
    daschuer committed Jul 11, 2013
    Configuration menu
    Copy the full SHA
    a64f8df View commit details
    Browse the repository at this point in the history

  2. Changed some more ControlObjectThreadMain instances to 

    ControlObjectThread if no direct connection is used.
    @daschuer
    daschuer committed Jul 11, 2013
    Configuration menu
    Copy the full SHA
    8fd9cd1 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2013

  1. Finaly Changed remaining ControlObjectThreadMain instances to 

    ControlObjectThread where no direct connection is used.
    @daschuer
    daschuer committed Jul 12, 2013
    Configuration menu
    Copy the full SHA
    b1dabc6 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2013

  1. Merge branch 'master' into atomic-co3

    @daschuer
    daschuer committed Jul 13, 2013
    Configuration menu
    Copy the full SHA
    55c9ef4 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2013

  1. check COs in WaveformMarkRange for being != NULL

    @daschuer
    daschuer committed Oct 11, 2013
    Configuration menu
    Copy the full SHA
    84ab3d2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into atomic-co3 

    Conflicts:
	src/dlgprefcontrols.cpp
	src/dlgprefrecord.cpp
	src/dlgprefrecord.h
	src/widget/wnumberpos.h
    @daschuer
    daschuer committed Oct 11, 2013
    Configuration menu
    Copy the full SHA
    cbf2ee4 View commit details
    Browse the repository at this point in the history

  3. fixed compiling after merge

    @daschuer
    daschuer committed Oct 11, 2013
    Configuration menu
    Copy the full SHA
    95f38a5 View commit details
    Browse the repository at this point in the history