still recovering from troubled merge

This commit is contained in:
Seth Alves 2015-03-13 18:21:59 -07:00
parent 8481a65fbb
commit af2c00b235

View file

@ -9,11 +9,10 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <QDebug>
#include <glm/gtx/norm.hpp>
#include "ShapeManager.h"
#include "ShapeInfoUtil.h"
#include "ShapeManager.h"
ShapeManager::ShapeManager() {
}