seth update
クラス分け
クラス分け
Merge branch 'dev' of https://github.com/sinanzam0613/FishLight into dev

Conflicts:
	proj.win32/FishLight.sdf
	proj.win32/FishLight.v12.suo
	proj.win32/FishLight.vcxproj.filters
2014/10/27 Toshikawa

エンディングレイヤー編集。
Revert "2014/10/27 Toshikawa"

This reverts commit bde5dbc565cabf40dc485c4c077575c5c7587f6c.
2014/10/27 Toshikawa

エンディングレイヤー編集。
Revert "2014/10/27 Toshikawa"

This reverts commit bde5dbc565cabf40dc485c4c077575c5c7587f6c.
Merge branch 'MyBranch' of https://github.com/ToshikawaSeita/FishLight into MyBranch
continue ios
Merge pull request #14 from sinanzam0613/dev

add Class Enemy
2014/10/27 Toshikawa

エンディングレイヤー編集。
Revert "2014/10/27 Toshikawa"

This reverts commit bde5dbc565cabf40dc485c4c077575c5c7587f6c.
Merge branch 'MyBranch' of https://github.com/ToshikawaSeita/FishLight into MyBranch

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'dev' of https://github.com/setu15/FishLight into dev
Merge pull request #15 from setu15/dev

Dev
update mask
update 10/28
add seafly
add Camera