diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-24 12:24:17 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-24 12:24:17 (GMT) |
| commit | 9b5b85f9b01cbda7ef9a7ec2a15b2a35630a5b9d (patch) | |
| tree | ac7d040253b459ce102e476cb19ab59e3cfa90d7 /src/simulation | |
| parent | 6bf98ccdca39936a3c51367862eed7c49f8786ec (diff) | |
| parent | bdc69f31c0be94191015838886bdcc2bc67f1acb (diff) | |
| download | powder-9b5b85f9b01cbda7ef9a7ec2a15b2a35630a5b9d.zip powder-9b5b85f9b01cbda7ef9a7ec2a15b2a35630a5b9d.tar.gz | |
Merge branch 'reorganisation' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/SaveRenderer.cpp | 2 | ||||
| -rw-r--r-- | src/simulation/Simulation.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/SaveRenderer.cpp b/src/simulation/SaveRenderer.cpp index 05601d9..4fabd95 100644 --- a/src/simulation/SaveRenderer.cpp +++ b/src/simulation/SaveRenderer.cpp @@ -3,7 +3,7 @@ #include "graphics/Graphics.h" #include "Simulation.h" #include "graphics/Renderer.h" -#include "search/Thumbnail.h" +#include "gui/search/Thumbnail.h" SaveRenderer::SaveRenderer(){ diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index d59ac51..bec937f 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -18,7 +18,7 @@ //#include "graphics/Graphics.h" #include "Misc.h" #include "Tools.h" -#include "game/Brush.h" +#include "gui/game/Brush.h" #include "client/GameSave.h" #include "Sample.h" #include "Snapshot.h" |