Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic

This commit is contained in:
Rudolf Polzer 2014-01-24 17:50:17 +01:00
commit 195408ed33

View File

@ -36,7 +36,11 @@ R AaQzHJT+/f6XHfZ4Zabz2KR7dXwQsoKJ1XYICRNo7to=
R UQmpkXkHoHwxLDnpN9RefNFsWyT8rh5vnk9SBm0z8/0=
R Q8WVFydNurVBXCzvqI+WVu1drhbcKL6CRGwpY4E4M6g=
R NNCc4COD691etf99X9ZtcLrvqJ5seo+qOoyWao/t/Fo=
R 74.91.112.86:26000
R J9JepdOZjvCBXYfz8fj3civ4PulKF4/asnK9u5ZojYg=
R kljWd72jWwuvquX1bk4x3hOaj+1dxWAFeSaLAMyVuL4=
R fpd0YafKdywMMxHR5xAwyK4Xn/POe67n52a1wKNS3dY=
R 6QtAVwbWcJFYZDvSeuZHEaaJE4JoTzmNni/LPZUSOKE=
R r29WNw5YU6fE+ukMXJtyioXZkgbTjgNou/OQLAbPGul=
# Promoted servers. Always show up as recommended, even if "slow".
# P <key or IP here>