diff options
| author | esk7610 <esk7610@rit.edu> | 2010-02-17 20:34:47 (GMT) |
|---|---|---|
| committer | esk7610 <esk7610@rit.edu> | 2010-02-17 20:34:47 (GMT) |
| commit | bf5ad2bf3ba645ff6b6e810fdb442bd971f84646 (patch) | |
| tree | 55c0b0aaf9c75823df4de3728c3b5a0a9c9a3232 /MAFH.activity | |
| parent | 323670156c88d8b73c77e417ad1c74e07d2d837c (diff) | |
| parent | 8eee9edc562d1be9988a5dfee9e3282c498328c7 (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:project-xavier/mainline
Conflicts:
MAFH.activity/assets/map/bl3.txt
MAFH.activity/assets/map/bl4.txt
MAFH.activity/assets/map/bl5.txt
Diffstat (limited to 'MAFH.activity')
| -rwxr-xr-x | MAFH.activity/assets/map/al5.txt | 40 | ||||
| -rwxr-xr-x | MAFH.activity/assets/map/bl1.txt | 50 |
2 files changed, 45 insertions, 45 deletions
diff --git a/MAFH.activity/assets/map/al5.txt b/MAFH.activity/assets/map/al5.txt index b323933..cb2f87e 100755 --- a/MAFH.activity/assets/map/al5.txt +++ b/MAFH.activity/assets/map/al5.txt @@ -3,23 +3,23 @@ al5.txt 5x4 0 bl1.txt -0000Wu000000000000000
-00Su00000000000000000
-000000000000000000000
-00Su00Eu0000000000000
-0000WuEl0000000000000
-0000WxEu0000000000000
-NuSuWuEu0000000000000
-0000WuEu0000000000000
-NuSuWuEu00000qv000000
-0000Wu000000000000000
-000000000000000000000
-NuSu000000000rv000000
-000000000000000000000
-NuSu00000000000000000
-000000000000000000000
-000000Eu0000000000000
-Nu00WuEu0000000000000
-00SeWuEu0000000000000
-Nu00WuEu0000000000000
-0000Wu000000000000000
+0000Wu000000000000000 +00Su00000000000000000 +000000000000000000000 +00Su00Eu0000000000000 +0000WuEl0000000000000 +0000WxEu0000000000000 +NuSuWuEu0000000000000 +0000WuEu0000000000000 +NuSuWuEu00000qv000000 +0000Wu000000000000000 +000000000000000000000 +NuSu000000000rv000000 +000000000000000000000 +NuSu00000000000000000 +000000000000000000000 +000000Eu0000000000000 +Nu00WuEu0000000000000 +00SeWuEu0000000000000 +Nu00WuEu0000000000000 +0000Wu000000000000000 diff --git a/MAFH.activity/assets/map/bl1.txt b/MAFH.activity/assets/map/bl1.txt index 9c7d8f7..6149542 100755 --- a/MAFH.activity/assets/map/bl1.txt +++ b/MAFH.activity/assets/map/bl1.txt @@ -3,28 +3,28 @@ bl1.txt 5x5 1 bl2.txt -00Su00Eu00000qh0000000000
-0000WuEu00700000000000000
-0000WuEu00000000000000000
-0000WpEu00000000000000000
-0000WuEe00000000000000000
-NuSb000000000000000000000
-0000000000000000000000000
-0000000000000000000000000
-0000000000000000000000000
-0000000000000000000000000
-Nu0000Eu00800000000000000
-0000WuEu00000000000000000
-0000WuEu00000000000000000
-00SuWu0000880000000000000
-0000000000000000000000000
-0000000000000000000000000
-0000000000000000000000000
-0000000000000000000000000
-NuSu00Eu00000000000000000
-0000Wu000700800rb00000000
-0000WxEu00000000000000000
-0000WuEu00000000000000000
-0000WuEu00000000000000000
-Nu00Wu00S0000000000000000
-0000000000000000000000000
+00Su00Eu00000qh0000000000 +0000WuEu00700000000000000 +0000WuEu00000000000000000 +0000WpEu00000000000000000 +0000WuEe00000000000000000 +NuSb000000000000000000000 +0000000000000000000000000 +0000000000000000000000000 +0000000000000000000000000 +0000000000000000000000000 +Nu0000Eu00800000000000000 +0000WuEu00000000000000000 +0000WuEu00000000000000000 +00SuWu0000880000000000000 +0000000000000000000000000 +0000000000000000000000000 +0000000000000000000000000 +0000000000000000000000000 +NuSu00Eu00000000000000000 +0000Wu000700800rb00000000 +0000WxEu00000000000000000 +0000WuEu00000000000000000 +0000WuEu00000000000000000 +Nu00Wu00S0000000000000000 +0000000000000000000000000 |