summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2010-09-26 20:51:16 +0000
committerRobert Jonsson <spamatica@gmail.com>2010-09-26 20:51:16 +0000
commit5714fbc84298e916a152d59f656882350d07f6eb (patch)
treeadfd73964ce4be5b448d9d5244f95bd86d319682
parente8b5334796e137ac673e4b4772aec93e347c6627 (diff)
1.1 prep
-rw-r--r--muse/ChangeLog4
-rw-r--r--muse/configure.ac2
-rw-r--r--muse/muse/app.cpp6
-rw-r--r--muse/share/splash.pngbin45374 -> 45958 bytes
4 files changed, 8 insertions, 4 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog
index d8987862..973b05ac 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,3 +1,7 @@
+26.09.2010
+ =======================================
+ * 1.0 tagged (rj)
+ =======================================
21.09.2010
* Fixed: Mixers not restoring their size properly upon song load. (T356)
- Rearranged MusE::loadProjectFile1() slightly so mixer resizing done at end. Tested OK.
diff --git a/muse/configure.ac b/muse/configure.ac
index d67fc4e1..e1abe33a 100644
--- a/muse/configure.ac
+++ b/muse/configure.ac
@@ -2,7 +2,7 @@ dnl --------------------------------------------------
dnl configure.ac for the MusE
dnl --------------------------------------------------
-AC_INIT(MusE, 1.1rc2)
+AC_INIT(MusE, 1.1)
AC_CONFIG_SRCDIR(muse/app.cpp)
AM_INIT_AUTOMAKE(1.1)
AM_CONFIG_HEADER(config.h)
diff --git a/muse/muse/app.cpp b/muse/muse/app.cpp
index 4d8586a5..9edeb20d 100644
--- a/muse/muse/app.cpp
+++ b/muse/muse/app.cpp
@@ -1314,9 +1314,9 @@ MusE::MusE(int argc, char** argv) : QMainWindow(0, "mainwindow")
menu_ids[CMD_OPEN_BUG] = menu_help->insertItem(tr("&Report Bug..."), this, SLOT(startBugBrowser()), 0);
menu_help->insertSeparator();
menu_help->insertItem(tr("&About MusE"), this, SLOT(about()));
- menu_help->insertItem(tr("About&Qt"), this, SLOT(aboutQt()));
- menu_help->insertSeparator();
- menu_ids[CMD_START_WHATSTHIS] = menu_help->insertItem(tr("What's &This?"), this, SLOT(whatsThis()), 0);
+ //menu_help->insertItem(tr("About&Qt"), this, SLOT(aboutQt()));
+ //menu_help->insertSeparator();
+ //menu_ids[CMD_START_WHATSTHIS] = menu_help->insertItem(tr("What's &This?"), this, SLOT(whatsThis()), 0);
//---------------------------------------------------
// Central Widget
diff --git a/muse/share/splash.png b/muse/share/splash.png
index 077e305e..38d7c465 100644
--- a/muse/share/splash.png
+++ b/muse/share/splash.png
Binary files differ