nitta-lab-2018:master
from nitta-lab-2018:restore
on 28 Jun 2018
.idea/caches/build_file_checksums.ser |
---|
Not supported
|
app/build.gradle |
---|
app/src/main/AndroidManifest.xml |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AddressedEntity.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGame2Fragment.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGameFragment.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleUiFragment.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/BaseActor.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTimeActivity.java |
---|
app/src/main/res/layout/activity_sample.xml |
---|
build.gradle |
---|
マージお願いします。
これで、マスターのエラーが消えるかと思います。
Restore
3ab171f
intomaster
fromrestore
on 28 Jun 2018