Merge branch 'master' into upstream-merge-31877

2017-10-28 23:57:51 -04:00
parent 5dbcbf5689 1265e804c5
commit e150fe28b6
629 changed files with 207532 additions and 225684 deletions
@@ -239,7 +239,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						S["real_name"] >> name
 						if(!name)
 							name = "Character[i]"
-						//if(i!=1) dat += " | "
+						/*if(i!=1)
+							dat += " | " */
 						dat += "<a style='white-space:nowrap;' href='?_src_=prefs;preference=changeslot;num=[i];' [i == default_slot ? "class='linkOn'" : ""]>[name]</a> "
 					dat += "</center>"