latest 22:58
latest 1023
a
pull akama
latest
Merge branch 'master' of https://github.com/noblesseoblige6/SquallBall

Conflicts:
	Assets/Scripts/TestSphere.cs
a
Merge branch 'master' of https://github.com/noblesseoblige6/SquallBall

Conflicts:
	Assets/Scripts/For_Balls/DeleteBlueBalls.cs
	Assets/Scripts/For_Balls/DeleteGreenBalls.cs
	Assets/Scripts/For_Balls/DeleteRedBalls.cs
latest
latest
bug 発見
under const
Merge branch 'master' of https://github.com/noblesseoblige6/SquallBall

Conflicts:
	Assets/Scripts/TestSphere.cs
Merge branch 'master' into issue55_kamada

Conflicts:
	Assets/Scripts/TestSphere.cs
testinggit add -i
Merge branch 'master' of https://github.com/noblesseoblige6/SquallBall

Conflicts:
	ProjectSettings/TagManager.asset
Merge branch 'master' into issue55_kamada
save
none
none