Merge branch 'master' into upstream-merge-31129

2017-10-01 15:45:54 -04:00
parent 2635689e79 19abe58f05
commit 6ca3deb8d1
205 changed files with 71846 additions and 7047 deletions
@@ -381,7 +381,7 @@
 	else if(transfer_after)
 		R.key = key

-	if (config.rename_cyborg)
+	if (CONFIG_GET(flag/rename_cyborg))
 		R.rename_self("cyborg")

 	if(R.mmi)