Merge branch 'master' of ssh://isaac.ssl.berkeley.edu/boinc-v2

This commit is contained in:
David Anderson 2014-01-08 08:00:10 +00:00
commit dce192b321
1 changed files with 0 additions and 4 deletions

View File

@ -247,11 +247,7 @@ void GLOBAL_PREFS::defaults() {
#endif
run_gpu_if_user_active = false;
run_if_user_active = true;
#ifdef ANDROID
run_on_batteries = false;
#else
run_on_batteries = true;
#endif
#ifdef ANDROID
suspend_cpu_usage = 50;
#else