Merge remote-tracking branch 'upstream/master'

2016-09-11 04:11:51 -07:00
parent a00841a498 30bd1d7362
commit c952c50ad9
66 changed files with 2812 additions and 1923 deletions
--- a/examples/SharedMemory/SharedMemoryPublic.h
+++ b/examples/SharedMemory/SharedMemoryPublic.h
@@ -72,6 +72,8 @@ enum EnumSharedMemoryServerStatus
        CMD_CALCULATED_JACOBIAN_FAILED,
 		CMD_CONTACT_POINT_INFORMATION_COMPLETED,
 		CMD_CONTACT_POINT_INFORMATION_FAILED,
+		CMD_CALCULATE_INVERSE_KINEMATICS_COMPLETED,
+		CMD_CALCULATE_INVERSE_KINEMATICS_FAILED,
        CMD_MAX_SERVER_COMMANDS
 };