Permalink
Browse files

Merge branch '0.6'

  • Loading branch information...
2 parents 1875fcb + 8ea225a commit eab4971993edade67edc9445624f6ca28c4b30fe @Ablu Ablu committed May 21, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 src/defaults.cpp
  2. +1 −1 src/gui/windowmenu.cpp
View
@@ -109,8 +109,8 @@ DefaultsData* getConfigDefaults()
AddDEF(configData, "whispertab", true);
AddDEF(configData, "customcursor", true);
AddDEF(configData, "showownname", false);
- AddDEF(configData, "showpickupparticle", false);
- AddDEF(configData, "showpickupchat", true);
+ AddDEF(configData, "showpickupparticle", true);
+ AddDEF(configData, "showpickupchat", false);
AddDEF(configData, "fontSize", 12);
AddDEF(configData, "ReturnToggles", false);
AddDEF(configData, "ScrollLaziness", 16);
View
@@ -72,7 +72,7 @@ WindowMenu::WindowMenu():
addButton(N_("Setup"), x, h, "button-icon-setup.png",
KeyboardConfig::KEY_WINDOW_SETUP);
- setDimension(gcn::Rectangle(graphics->getWidth() - x - 3, 3,
+ setDimension(gcn::Rectangle(graphics->getWidth() - x, 3,
x - 3, h));
setVisible(true);
}

0 comments on commit eab4971

Please sign in to comment.