From: Sam Moore <matches@ucc.asn.au>
Date: Tue, 16 Sep 2014 10:46:43 +0000 (+0800)
Subject: Merge branch 'master' of git.ucc.asn.au:/ipdf/code
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=77137590512d969da2d54d9ba53d76836a290c6a;p=ipdf%2Fcode.git

Merge branch 'master' of git.ucc.asn.au:/ipdf/code

sulix fixed the quad trees and I forgot about `git stash` again.
---

77137590512d969da2d54d9ba53d76836a290c6a
diff --cc src/Makefile
index 8813b08,668f0a9..38f69fd
--- a/src/Makefile
+++ b/src/Makefile
@@@ -1,9 -1,9 +1,9 @@@
  #Makefile
  ARCH := $(shell uname -m)
  # TODO: stb_truetype doesn't compile with some of these warnings.
 -CXX = g++ -std=gnu++0x -g -Wall -Werror -Wshadow -pedantic -rdynamic
 +CXX = g++ -std=c++11 -g -Wall -Werror -Wshadow -pedantic -rdynamic
  MAIN = main.o
- OBJ = log.o real.o bezier.o document.o objectrenderer.o view.o screen.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o  path.o paranoidnumber.o
+ OBJ = log.o real.o bezier.o document.o objectrenderer.o view.o screen.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o  path.o paranoidnumber.o quadtree.o
  
  QT_INCLUDE := -I/usr/share/qt4/mkspecs/linux-g++-64 -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -Itests -I.
  QT_DEF := -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB