diff options
| author | dmazzone <mazzone.diego@gmail.com> | 2010-10-06 17:29:05 (GMT) |
|---|---|---|
| committer | dmazzone <mazzone.diego@gmail.com> | 2010-10-06 17:29:05 (GMT) |
| commit | aec9722520e8e960e0dad55b9efcf85d427a37df (patch) | |
| tree | 45c85a3c5fd7251ce0ef31c14d5b5f07adadb73e /Saludame.activity/window.py | |
| parent | 7a8359bbe35a32870a70e5895aa8ad391f947b62 (diff) | |
| parent | 6ac4b0a4886690ecbeb52853497d0b5c415a13ca (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/saludame/mainline
Conflicts [Fixed]:
Saludame.activity/customization.py
Diffstat (limited to 'Saludame.activity/window.py')
| -rwxr-xr-x | Saludame.activity/window.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Saludame.activity/window.py b/Saludame.activity/window.py index 66ad0d5..8795535 100755 --- a/Saludame.activity/window.py +++ b/Saludame.activity/window.py @@ -193,8 +193,7 @@ class MainWindow(Window): self.windows_controller.set_active_window("challenges") def _cb_button_click_customization(self, button): - #self.windows_controller.set_active_window("customization") - pass + self.windows_controller.set_active_window("customization") ######################################## |