# HG changeset patch # User unc0rr # Date 1316281698 -14400 # Node ID 39d8cdee439145f93246c7eeb5fcba8294adab7d # Parent 57af6f3abf4a4698552e2d428a2dd39fd3059f2f# Parent 2aead3f940b0856ad9e25d125f3a612c8fdf272e okay, let's revert this for now diff -r 2aead3f940b0 -r 39d8cdee4391 CMakeLists.txt --- a/CMakeLists.txt Sat Sep 17 13:40:54 2011 -0400 +++ b/CMakeLists.txt Sat Sep 17 21:48:18 2011 +0400 @@ -12,7 +12,7 @@ #detect Mercurial revision (if present) -set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME +set(version_suffix "") #UNSET THIS VARIABLE AT RELEASE TIME set(HGCHANGED "") IF(version_suffix MATCHES "-dev") set(HW_DEV true) @@ -42,7 +42,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR 0) set(CPACK_PACKAGE_VERSION_MINOR 9) set(CPACK_PACKAGE_VERSION_PATCH 16${version_suffix}) -set(HEDGEWARS_PROTO_VER 38) +set(HEDGEWARS_PROTO_VER 39) set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") diff -r 2aead3f940b0 -r 39d8cdee4391 QTfrontend/chatwidget.cpp --- a/QTfrontend/chatwidget.cpp Sat Sep 17 13:40:54 2011 -0400 +++ b/QTfrontend/chatwidget.cpp Sat Sep 17 21:48:18 2011 +0400 @@ -203,7 +203,7 @@ QList items = chatNicks->findItems(nick, Qt::MatchExactly); if (items.size() < 1) return; - QMenu * popup = new QMenu(); + QMenu * popup = new QMenu(this); // selecting an item will automatically scroll there, so let's save old position QScrollBar * scrollBar = chatNicks->verticalScrollBar(); int oldScrollPos = scrollBar->sliderPosition();