Merge changes

This commit is contained in:
Snek 2017-03-10 19:52:38 +03:00
commit 5846cca2f0
1 changed files with 1 additions and 1 deletions

View File

@ -40,10 +40,10 @@ public class MainActivity extends AppCompatActivity {
final int REQUEST_PERMISSION_RECORD_AUDIO = 1;
TextView subtitles;
ImageView kurisu;
AnimationDrawable animation;
Boolean isLoop = false;
Boolean isSpeaking = false;
VoiceLine[] voiceLines = VoiceLine.Line.getLines();
AnimationDrawable animation;
int shaman_girls = -1;
Random randomgen = new Random();
SharedPreferences sharedPreferences;