Merge branch 'master' into fuzz-pipe

Conflicts:
	bin/package.json
	src/style/style_parser.cpp
	test/fixtures/fixture_log.cpp
	test/test.gyp
This commit is contained in:
Mike Morris
2014-07-17 12:44:45 -04:00
243 changed files with 2338 additions and 1805 deletions

View File

@@ -1,12 +1,12 @@
#include "gtest/gtest.h"
#include <llmr/style/style.hpp>
#include <mbgl/style/style.hpp>
#include "./fixtures/fixture_log.hpp"
#include <iostream>
#include <fstream>
using namespace llmr;
using namespace mbgl;
typedef std::vector<std::pair<uint32_t, std::string>> Messages;