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

Merge upstream changes from RobotLocomotion/libbot #3

Open
wants to merge 9 commits into
base: libbot-openhumanoids
Choose a base branch
from
Open

Merge upstream changes from RobotLocomotion/libbot #3

wants to merge 9 commits into from

Commits on Nov 20, 2015

  1. typo in variable name in schedule_cmd_for_removal 

    schedule_comand_for_removal function referenced `command` variable while `cmd` was passed in. believed to be a typo.
    @joeromano
    joeromano committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    810d5ee View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2015

  1. Merge pull request RobotLocomotion#14 from joeromano/schedule_removal… 

    …_cmd_typo

typo in variable name in schedule_cmd_for_removal
    @RussTedrake
    RussTedrake committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    fb9b62f View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2016

  1. Add "dummy" install target 

    Add some no-op install logic to force creation of an 'install' target.
This allows for easier use of libbot via CMake external projects, by not
requiring such users to explicitly disable the install step.
    @mwoehlke-kitware
    mwoehlke-kitware committed Mar 17, 2016
    Configuration menu
    Copy the full SHA
    066bbdb View commit details
    Browse the repository at this point in the history

  2. Merge pull request RobotLocomotion#15 from mwoehlke-kitware/add-insta… 

    …ll-target

Add "dummy" install target
    @RussTedrake
    RussTedrake committed Mar 17, 2016
    Configuration menu
    Copy the full SHA
    cc8d228 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2016

  1. fix typo

    @peterkty
    peterkty committed Apr 1, 2016
    Configuration menu
    Copy the full SHA
    cdb3e4e View commit details
    Browse the repository at this point in the history

  2. Merge pull request RobotLocomotion#16 from peterkty/master 

    fix typo
    @RussTedrake
    RussTedrake committed Apr 1, 2016
    Configuration menu
    Copy the full SHA
    70a6f43 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2016

  1. Changed so builds happen out of source.

    John R. Hoare committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    647915b View commit details
    Browse the repository at this point in the history

  2. Merge pull request RobotLocomotion#18 from jhoare/out_of_source_builds 

    Changed so builds happen out of source.
    @RussTedrake
    RussTedrake authored Jul 11, 2016
    Configuration menu
    Copy the full SHA
    6d932c8 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2016

  1. Merge remote-tracking branch 'upstream/master' into libbot-openhumanoids 

    Conflicts:
	CMakeLists.txt
    @gizatt
    gizatt committed Aug 18, 2016
    Configuration menu
    Copy the full SHA
    c9b9365 View commit details
    Browse the repository at this point in the history