Menu

Commit [r56]  Maximize  Restore  History

マージか失敗しましたので、

revision40 へ戻ります。

wang0307 2017-03-29

1 2 > >> (Page 1 of 2)
changed /app/src/main/cpp/Classes/AppDelegate.cpp
changed /app/src/main/cpp/Classes/CCSAXParser.h
changed /app/src/main/cpp/Classes/HelloWorldScene.cpp
changed /app/src/main/cpp/Classes/HelloWorldScene.h
changed /app/src/main/cpp/Classes/NetConnetion.cpp
changed /app/src/main/cpp/Classes/Parts/Account/AccountView.cpp
changed /app/src/main/cpp/Classes/Parts/CarryChips/CarryChipsControl.cpp
changed /app/src/main/cpp/Classes/Parts/CarryChips/CarryChipsControl.h
changed /app/src/main/cpp/Classes/Parts/CarryChips/CarryChipsView.cpp
changed /app/src/main/cpp/Classes/Parts/CarryChips/CarryChipsView.h
changed /app/src/main/cpp/Classes/Parts/Competition/CompetitionView.cpp
changed /app/src/main/cpp/Classes/Parts/Friends/FriendsView.cpp
changed /app/src/main/cpp/Classes/Parts/Warning/WarnControl.cpp
changed /app/src/main/cpp/Classes/Parts/Warning/WarnControl.h
changed /app/src/main/cpp/Classes/Parts/Warning/WarnView.cpp
changed /app/src/main/cpp/Classes/Poker/Holdem/HoldemControl.cpp
changed /app/src/main/cpp/Classes/Poker/Holdem/HoldemControl.h
changed /app/src/main/cpp/Classes/Poker/Holdem/HoldemModel.cpp
changed /app/src/main/cpp/Classes/Poker/Holdem/HoldemModel.h
changed /app/src/main/cpp/Classes/Poker/Holdem/HoldemPlayerModel.h
changed /app/src/main/cpp/Classes/Poker/Holdem/HoldemRoomModel.h
changed /app/src/main/cpp/Classes/Poker/Holdem/HoldemView.h
changed /app/src/main/cpp/Classes/Poker/Scene/GameControl.cpp
changed /app/src/main/cpp/Classes/Poker/Scene/GameControl.h
changed /app/src/main/cpp/Classes/Scene/Hall/LobbyControl.cpp
/app/src/main/cpp/Classes/AppDelegate.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/CCSAXParser.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/HelloWorldScene.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/HelloWorldScene.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/NetConnetion.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Parts/Account/AccountView.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Parts/CarryChips/CarryChipsControl.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Parts/CarryChips/CarryChipsControl.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Parts/CarryChips/CarryChipsView.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Parts/CarryChips/CarryChipsView.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Parts/Competition/CompetitionView.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Parts/Friends/FriendsView.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Parts/Warning/WarnControl.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Parts/Warning/WarnControl.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Parts/Warning/WarnView.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Poker/Holdem/HoldemControl.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Poker/Holdem/HoldemControl.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Poker/Holdem/HoldemModel.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Poker/Holdem/HoldemModel.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Poker/Holdem/HoldemPlayerModel.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Poker/Holdem/HoldemRoomModel.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Poker/Holdem/HoldemView.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Poker/Scene/GameControl.cpp Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Poker/Scene/GameControl.h Diff Switch to side-by-side view
Loading...
/app/src/main/cpp/Classes/Scene/Hall/LobbyControl.cpp Diff Switch to side-by-side view
Loading...
1 2 > >> (Page 1 of 2)
MongoDB Logo MongoDB