rebase branch onto latest develop, report changes. hurt a little

This commit is contained in:
Dennis Luxen
2014-12-17 19:02:48 +01:00
parent 06f82d5e8a
commit 6da33cafe5
12 changed files with 496 additions and 504 deletions
-1
View File
@@ -30,7 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "plugin_base.hpp"
#include "../data_structures/json_container.hpp"
#include "../Util/cast.hpp"
#include "../Util/json_renderer.hpp"