Merge branch 'master' into master

1 files changed, 4 insertions, 5 deletions

diff --git a/src/database/database-files.cpp b/src/database/database-files.cpp
index fe5293a68..d2b0b1543 100644
--- a/src/database/database-files.cpp
+++ b/src/database/database-files.cpp
@@ -95,7 +95,7 @@ void PlayerDatabaseFiles::savePlayer(RemotePlayer *player)
 
 	if (!path_found) {
 		errorstream << "Didn't find free file for player " << player->getName()
-			    << std::endl;
+				<< std::endl;
 		return;
 	}
 
@@ -156,8 +156,7 @@ bool PlayerDatabaseFiles::loadPlayer(RemotePlayer *player, PlayerSAO *sao)
 		path = players_path + player_to_load + itos(i);
 	}
 
-	infostream << "Player file for player " << player_to_load << " not found"
-		   << std::endl;
+	infostream << "Player file for player " << player_to_load << " not found" << std::endl;
 	return false;
 }
 
@@ -165,8 +164,8 @@ void PlayerDatabaseFiles::listPlayers(std::vector<std::string> &res)
 {
 	std::vector<fs::DirListNode> files = fs::GetDirListing(m_savedir);
 	// list files into players directory
-	for (std::vector<fs::DirListNode>::const_iterator it = files.begin();
-			it != files.end(); ++it) {
+	for (std::vector<fs::DirListNode>::const_iterator it = files.begin(); it !=
+		files.end(); ++it) {
 		// Ignore directories
 		if (it->dir)
 			continue;