From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Wed, 23 Dec 2015 01:04:04 +0000 (-0500)
Subject: shit
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=1ccd85fd022ab5d628c9e26a213e47cf2687fce7;p=clyne%2Fgamedev.git

shit
---

1ccd85fd022ab5d628c9e26a213e47cf2687fce7
diff --cc Changelog
index 0a44904,c894c5c..18b918e
--- a/Changelog
+++ b/Changelog
@@@ -411,4 -408,15 +411,19 @@@
  	- imrpoved BGM handling
  	- continued work on particles, made a fountain
  	- added sanic
++<<<<<<< HEAD
 +>>>>>>> 43bbcf02fd5e4e69a9aa521fa4cd572cc8675cf3
++=======
+ 	
+ 	~ Broke 5000 lines of code/doc, now with some file Doxygen'd
+ 
+ 12/14/2015:
+ ===========
+ 
+ 	- Re-implemented Arena
+ 		added door mob for exit
+ 		added white flash + sound transition
+ 	- fixed fading bugs
+ 	- continued fixing general game bugs
+ 	- fixed structure spawn issues
++>>>>>>> e67bfdde0b7e15ac6bc29993a92a89a844474554