Skip to content
Snippets Groups Projects
  • Evan Eames's avatar
    Merged in feature/xpra (pull request #179) · cf94ffeb
    Evan Eames authored and Eloy Retamino's avatar Eloy Retamino committed
    [NRRPLT-8808] nrp-core xpra integration
    
    * [NRRPLT-0000] engine_datatransfer.json edited online with Bitbucket
    * [NRRPLT-8926] Fix MQTT_BASE in tests
    
    * Merge remote-tracking branch 'origin/development' into NRRPLT-8926-mqtt-prefix
    * [NRRPLT-8926] Fix MQTT_BASE in tests
    
    * Merge branch 'NRRPLT-8926-mqtt-prefix' of bitbucket.org:hbpneurorobotics/nrp-core into NRRPLT-8926-mqtt-prefix
    
    * [NRRPLT-8926] Fix MQTT_BASE in tests
    
    * Merged development into NRRPLT-8926-mqtt-prefix
    * Merge branch 'development' into feature/xpra
    
    * Merge remote-tracking branch 'origin/NRRPLT-8926-mqtt-prefix' into feature/xpra
    
    * Merged development into feature/xpra
    
    Approved-by: Ugo Albanese
    Approved-by: Eloy Retamino
    Approved-by: Viktor Vorobev
    cf94ffeb