# HG changeset patch
# User nemo
# Date 1387928363 18000
# Node ID c14c5e2f9d6949313a16454c41d7b1e2a80b7631
# Parent  4dc7cb571e1ddb14850439eb5f2d121b0ce0b602# Parent  2b8f928faa1470858190cd9724b9ceed2a887358
merge w/ 0.9.20

diff -r 4dc7cb571e1d -r c14c5e2f9d69 CMakeLists.txt
diff -r 4dc7cb571e1d -r c14c5e2f9d69 ChangeLog.txt
--- a/ChangeLog.txt	Tue Dec 24 16:58:49 2013 -0500
+++ b/ChangeLog.txt	Tue Dec 24 18:39:23 2013 -0500
@@ -8,6 +8,7 @@
  + New rubber utility, lfBouncy mask (green) for maps.  lfBouncy is also anti-portal.
  + Lazy loading of many aspects of frontend to improve startup time under Windows
  + Set hog/team/health label defaults in config, toggle team health display using delete (left shift + delete for labels now)
+ + Usernames next to teams when playing online.
  + Can now filter rooms by game style (such as Highlander). Filtering simplified since it is mostly unused.
  + AFK mode.  Press p when not your turn online to trigger autoskip of your turn.
  + Russian localisation of Default voice.