diff options
| author | Jon Meschino <jam2707@rit.edu> | 2010-02-20 21:58:05 (GMT) |
|---|---|---|
| committer | Jon Meschino <jam2707@rit.edu> | 2010-02-20 21:58:05 (GMT) |
| commit | e288d634a3b1eb24f3343f285e3c250052319994 (patch) | |
| tree | fe71d0bf8310ce591b3aaa2463897b9ec137fe4f /MAFH.activity | |
| parent | 59b638b63aa8ad60af32537633d0b1c11ede5e23 (diff) | |
trying to resolve merging. no changes made to map files.
Diffstat (limited to 'MAFH.activity')
| -rw-r--r-- | MAFH.activity/assets/map/bl3.txt | 32 | ||||
| -rwxr-xr-x | MAFH.activity/assets/map/bl4.txt | 50 | ||||
| -rw-r--r-- | MAFH.activity/assets/map/bl5.txt | 2 |
3 files changed, 42 insertions, 42 deletions
diff --git a/MAFH.activity/assets/map/bl3.txt b/MAFH.activity/assets/map/bl3.txt index 5f9fd36..461f121 100644 --- a/MAFH.activity/assets/map/bl3.txt +++ b/MAFH.activity/assets/map/bl3.txt @@ -3,19 +3,19 @@ bl3.txt 4x4 1 bl4.txt -00SuWeEu00000000000000000
-00SuWu0000007000000000000
-00Sb00Eu00008000000000000
-00SuWu0000000000000000000
-NuSu00Eu00000000000000000
-Nu00Wu0000000qv0000000000
-NpSx00Ep00000000000000000
-NuSuWb0000007000000000000
-NuSu00El00000000000000000
-00SlWl0000008rv0000000000
-00Sp00Ep000008v0000000000
-NuSuWp0000000000000000000
-Nu0000Eu00008000000000000
-Nl00WuEu00000000000000000
-Np00WuEu00000000000000000
-NuWu000000007000000000000
+00SuWeEu00000000000000000 +00SuWu0000007000000000000 +00Sb00Eu00008000000000000 +00SuWu0000000000000000000 +NuSu00Eu00000000000000000 +Nu00Wu0000000qv0000000000 +NpSx00Ep00000000000000000 +NuSuWb0000007000000000000 +NuSu00El00000000000000000 +00SlWl0000008rv0000000000 +00Sp00Ep000008v0000000000 +NuSuWp0000000000000000000 +Nu0000Eu00008000000000000 +Nl00WuEu00000000000000000 +Np00WuEu00000000000000000 +NuWu000000007000000000000 diff --git a/MAFH.activity/assets/map/bl4.txt b/MAFH.activity/assets/map/bl4.txt index d9a1acc..f3bbae7 100755 --- a/MAFH.activity/assets/map/bl4.txt +++ b/MAFH.activity/assets/map/bl4.txt @@ -3,28 +3,28 @@ bl4.txt 5x5 1 bl5.txt -00Su00Eu00000000000000000
-0000WuEu00000000000000000
-NeSlWuEu07770000000000000
-0000WuEu00000000000000000
-00SuWu0000000000000000000
-NuSu000000000000000000000
-0000000000000000000000000
-NlSx0000S0000000000000000
-0000000000000000000000000
-NuSu000000000000000000000
-NuSu00El07870000000000000
-0000WlExS0000000000000000
-0000000000000000000000000
-0000WxElS0000000000000000
-NuSuWl0008780000000000000
-NuSu000000000000000000000
-0000000000000000000000000
-NxSl0000S0000000000000000
-0000000000000000000000000
-NuSu000000000000000000000
-Nu0000Eu00000000000000000
-0000WuEu00000000000000000
-Nl00WuEu08880000000000000
-0000WuEu000000000rv000000
-NuWu000000000qv0000000000
+00Su00Eu00000000000000000 +0000WuEu00000000000000000 +NeSlWuEu07770000000000000 +0000WuEu00000000000000000 +00SuWu0000000000000000000 +NuSu000000000000000000000 +0000000000000000000000000 +NlSx0000S0000000000000000 +0000000000000000000000000 +NuSu000000000000000000000 +NuSu00El07870000000000000 +0000WlExS0000000000000000 +0000000000000000000000000 +0000WxElS0000000000000000 +NuSuWl0008780000000000000 +NuSu000000000000000000000 +0000000000000000000000000 +NxSl0000S0000000000000000 +0000000000000000000000000 +NuSu000000000000000000000 +Nu0000Eu00000000000000000 +0000WuEu00000000000000000 +Nl00WuEu08880000000000000 +0000WuEu000000000rv000000 +NuWu000000000qv0000000000 diff --git a/MAFH.activity/assets/map/bl5.txt b/MAFH.activity/assets/map/bl5.txt index bbf4c6f..efd50d8 100644 --- a/MAFH.activity/assets/map/bl5.txt +++ b/MAFH.activity/assets/map/bl5.txt @@ -3,5 +3,5 @@ bl5.txt 1x2 1 0 -NeSu000000000000000000000
+NeSu000000000000000000000 Nx00000000600000000000000 |