Skip to content

Commit

Permalink
Merge branch 'master' of github.com:NASA-Tensegrity-Robotics-Toolkit/…
Browse files Browse the repository at this point in the history
…NTRTsim
  • Loading branch information
apsabelhaus committed Oct 5, 2016
2 parents 4102c4b + dbfcc82 commit 42622ea
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/dev/dhustigschultz/MG_FewerMuscles1/AppMGControlFM1.h
Expand Up @@ -90,6 +90,7 @@ class AppMGControlFM1
tgWorld* world; tgWorld* world;
tgSimView* view; tgSimView* view;
tgSimulation* simulation; tgSimulation* simulation;
JSONMGFeedbackControlFM1 * myControl;


bool use_graphics; bool use_graphics;
bool add_controller; bool add_controller;
Expand Down

0 comments on commit 42622ea

Please sign in to comment.