Merge remote-tracking branch 'upstream/master' into proto_json_forwarder

Former-commit-id: 6eb800d3ed5badd831bd79fc8cfb66115df8ec28
This commit is contained in:
redpanther
2016-02-24 15:07:30 +01:00
20 changed files with 383 additions and 66 deletions

View File

@@ -1,7 +1,3 @@
// STL includes
#include <cmath>
// Hyperion includes
#include <hyperion/ImageProcessorFactory.h>
#include <hyperion/ImageProcessor.h>