diff options
| author | Fernando Sansberro <sansberro@batovi.com> | 2012-04-11 13:05:49 (GMT) |
|---|---|---|
| committer | Fernando Sansberro <sansberro@batovi.com> | 2012-04-11 13:05:49 (GMT) |
| commit | 51e0a3f9905d18a8cc70730f6ccb1b0b7767de86 (patch) | |
| tree | ee1ca90dd520ff2bd51d65603a3e925048b09a11 /src/Main.py | |
| parent | 20dd48559e995173b815bb016c8747724a40ea8d (diff) | |
| parent | ade7004dad4ecd090e2ff5ee12305edf2a81568c (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:educacion-sexual/mainline.git
Conflicts:
src/api/Sprite.py
src/states/Area1Game1.py
Diffstat (limited to 'src/Main.py')
| -rwxr-xr-x | src/Main.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/Main.py b/src/Main.py index f49fe95..32a625b 100755 --- a/src/Main.py +++ b/src/Main.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*-
-import api
-import states
-import states.MenuState
from states.MenuState import CMenuState
-import api.Game
from api.Game import CGame
# Test dr git.
|