Merge branch 'master' into feature/timerclock

# Conflicts:
#	include/courtroom.h
#	src/courtroom.cpp

1 files changed, 0 insertions, 17 deletions

diff --git a/src/hex_functions.cpp b/src/hex_functions.cpp
deleted file mode 100644
index 1e35718f..00000000
--- a/src/hex_functions.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "hex_functions.h"
-
-namespace omni {
-std::string int_to_hex(unsigned int input)
-{
-  if (input > 255)
-    return "FF";
-
-  std::stringstream stream;
-  stream << std::setfill('0') << std::setw(sizeof(char) * 2) << std::hex
-         << input;
-  std::string result(stream.str());
-  std::transform(result.begin(), result.end(), result.begin(), ::toupper);
-
-  return result;
-}
-} // namespace omni