2014/12/15 Toshikawa

Plistファイルの読み込みクラスを作成。
FishLightのDebugApkを追加しました。
2014/12/15 Toshikawa

Plistファイルの読み込みクラスを作成。
FishLightのDebugApkを追加しました。
Merge branch 'MyBranch' of https://github.com/ToshikawaSeita/FishLight into MyBranch
kobayashi 12/15

change seafirefly
kobayashi 12/15

change seafirefly
Merge branch 'MegaKoba' of https://github.com/kobayashimega/FishLight into MegaKoba

Conflicts:
	Classes/AggressiveSeaFireFly.cpp
	Classes/SeaFireFlyManager.cpp
commit seafirefly

change
kobayashi 12/15

change seafirefly
Merge branch 'MegaKoba' of https://github.com/kobayashimega/FishLight into MegaKoba

Conflicts:
	Classes/AggressiveSeaFireFly.cpp
Merge pull request #38 from ToshikawaSeita/MyBranch

2014/12/15 Toshikawa
Merge pull request #39 from setu15/b_setuko

B setuko
change seafirefly

change
ref proj
kobayashi 12/15

change seafirefly
commit seafirefly

change
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/MainLayer.cpp
	Classes/PlistReader.cpp
	Classes/PlistReader.h
kobayashi 12/15

change seafirefly
change seafirefly

change
Merge branch 'MegaKoba' of https://github.com/kobayashimega/FishLight into MegaKoba

Conflicts:
	Classes/AggressiveSeaFireFly.cpp
Merge branch 'MegaKoba' of https://github.com/kobayashimega/FishLight into MegaKoba

Conflicts:
	Classes/AggressiveSeaFireFly.cpp