summaryrefslogtreecommitdiff
path: root/src/gui/game/PropertyTool.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-12 01:47:13 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-12 01:47:13 (GMT)
commit51f27bfad72e7fbc72388f63c3b8a48162e509a1 (patch)
treeabd95cad4e12085fb8a67f63bce788db44f61f03 /src/gui/game/PropertyTool.cpp
parent9d89d4b79b26584490e55cfb992fc58d3e11ea2b (diff)
parenta0a0e305a92b41923f7634fca1d30b0e71ee12e0 (diff)
downloadpowder-51f27bfad72e7fbc72388f63c3b8a48162e509a1.zip
powder-51f27bfad72e7fbc72388f63c3b8a48162e509a1.tar.gz
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/gui/game/PropertyTool.cpp')
-rw-r--r--src/gui/game/PropertyTool.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/game/PropertyTool.cpp b/src/gui/game/PropertyTool.cpp
index 05726d3..aff535e 100644
--- a/src/gui/game/PropertyTool.cpp
+++ b/src/gui/game/PropertyTool.cpp
@@ -232,4 +232,4 @@ void PropertyWindow::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl
void PropertyTool::Click(Simulation * sim, Brush * brush, ui::Point position)
{
new PropertyWindow(this, sim, position);
-} \ No newline at end of file
+}