Merge pull request #609 from Skylexia/patch-1

Fixed all the salmon.
This commit is contained in:
Chris Ward 2013-12-10 18:46:51 -08:00
commit 18a6d1761a

View file

@ -5507,16 +5507,16 @@ gsdust,348,0
rawfish,349,0
rafish,349,0
fish,349,0
rawsalamonfish,349,1
rasalamonfish,349,1
salamonfish,349,1
rawsalamon,349,1
rasalamon,349,1
salamon,349,1
rawsclownfish,349,2
rawsalmonfish,349,1
rasalmonfish,349,1
salmonfish,349,1
rawsalmon,349,1
rasalmon,349,1
salmon,349,1
rawclownfish,349,2
raclownfish,349,2
clownfish,349,2
rawspufferfish,349,3
rawpufferfish,349,3
rapufferfish,349,3
pufferfish,349,3
cookedfish,350,0
@ -5528,24 +5528,24 @@ gfish,350,0
roastedfish,350,0
roastfish,350,0
rofish,350,0
cookedsalamonfish,350,1
cooksalamonfish,350,1
csalamonfish,350,1
grilledsalamonfish,350,1
grillsalamonfish,350,1
gsalamonfish,350,1
roastedsalamonfish,350,1
roastsalamonfish,350,1
rosalamonfish,350,1
cookedsalamon,350,1
cooksalamon,350,1
csalamon,350,1
grilledsalamon,350,1
grillsalamon,350,1
gsalamon,350,1
roastedsalamon,350,1
roastsalamon,350,1
rosalamon,350,1
cookedsalmonfish,350,1
cooksalmonfish,350,1
csalmonfish,350,1
grilledsalmonfish,350,1
grillsalmonfish,350,1
gsalmonfish,350,1
roastedsalmonfish,350,1
roastsalmonfish,350,1
rosalmonfish,350,1
cookedsalmon,350,1
cooksalmon,350,1
csalmon,350,1
grilledsalmon,350,1
grillsalmon,350,1
gsalmon,350,1
roastedsalmon,350,1
roastsalmon,350,1
rosalmon,350,1
dye,351,0
inksack,351,0
inksac,351,0

1 #version: TeamCity
5507 rawfish,349,0
5508 rafish,349,0
5509 fish,349,0
5510 rawsalamonfish,349,1 rawsalmonfish,349,1
5511 rasalamonfish,349,1 rasalmonfish,349,1
5512 salamonfish,349,1 salmonfish,349,1
5513 rawsalamon,349,1 rawsalmon,349,1
5514 rasalamon,349,1 rasalmon,349,1
5515 salamon,349,1 salmon,349,1
5516 rawsclownfish,349,2 rawclownfish,349,2
5517 raclownfish,349,2
5518 clownfish,349,2
5519 rawspufferfish,349,3 rawpufferfish,349,3
5520 rapufferfish,349,3
5521 pufferfish,349,3
5522 cookedfish,350,0
5528 roastedfish,350,0
5529 roastfish,350,0
5530 rofish,350,0
5531 cookedsalamonfish,350,1 cookedsalmonfish,350,1
5532 cooksalamonfish,350,1 cooksalmonfish,350,1
5533 csalamonfish,350,1 csalmonfish,350,1
5534 grilledsalamonfish,350,1 grilledsalmonfish,350,1
5535 grillsalamonfish,350,1 grillsalmonfish,350,1
5536 gsalamonfish,350,1 gsalmonfish,350,1
5537 roastedsalamonfish,350,1 roastedsalmonfish,350,1
5538 roastsalamonfish,350,1 roastsalmonfish,350,1
5539 rosalamonfish,350,1 rosalmonfish,350,1
5540 cookedsalamon,350,1 cookedsalmon,350,1
5541 cooksalamon,350,1 cooksalmon,350,1
5542 csalamon,350,1 csalmon,350,1
5543 grilledsalamon,350,1 grilledsalmon,350,1
5544 grillsalamon,350,1 grillsalmon,350,1
5545 gsalamon,350,1 gsalmon,350,1
5546 roastedsalamon,350,1 roastedsalmon,350,1
5547 roastsalamon,350,1 roastsalmon,350,1
5548 rosalamon,350,1 rosalmon,350,1
5549 dye,351,0
5550 inksack,351,0
5551 inksac,351,0