From f5a0989c9088be56c9384c2e896a0d2c184065ac Mon Sep 17 00:00:00 2001
From: Alex Levenson <alexlevenson@laptop.org>
Date: Wed, 16 Jul 2008 18:20:45 +0000
Subject: Merge branch 'master' of git+ssh://alevenson@dev.laptop.org/git/activities/physics

---
(limited to 'tools.py')

diff --git a/tools.py b/tools.py
index 7befaa6..6df93c7 100644
--- a/tools.py
+++ b/tools.py
@@ -40,8 +40,8 @@ class Tool(object):
                 self.game.setTool("destroy")
             elif event.key == K_m:
                 self.game.setTool("magicpen")
-            elif event.key == K_g:
-                self.game.setTool("gear")
+            #elif event.key == K_g:
+            #    self.game.setTool("gear")
         elif event.type == USEREVENT:
             if hasattr(event,"action"):
                 if self.game.tools.has_key(event.action): self.game.setTool(event.action)
@@ -399,4 +399,4 @@ def list_local_classes():
     return [val for val in this_mod.__dict__.values()
                 if isinstance(val, type)]
 
-local_classes = list_local_classes()
\ No newline at end of file
+local_classes = list_local_classes()
--
cgit v0.9.1