Commit graph

412 commits

Author SHA1 Message Date
Werner Schweer
fd80d6e042 Merge branch 'master' of github.com:musescore/MuseScore
Conflicts:
	CMakeLists.txt
	README.md
2012-06-07 09:27:36 +02:00
lasconic
69f78f2c82 simplify CMakeLists.txt a bit 2012-06-05 16:34:14 +02:00
Werner Schweer
6d3d53dd67 Merge branch 'master' into qml
Conflicts:
	Doxyfile.in
2012-06-05 11:14:54 +02:00
Werner Schweer
ff4a00f975 remove zarchive, replace with qt implementation 2012-06-04 21:06:12 +02:00
Werner Schweer
7ed6c2969d remove zarchive, replace with qt implementation 2012-06-04 21:06:12 +02:00
Werner Schweer
9e38c9ab7f Merge branch 'master' into qml
Conflicts:
	.gitignore
	CMakeLists.txt
	mscore/musescore.cpp
2012-06-04 20:27:36 +02:00
Werner Schweer
126584b509 new beam code, fixes a cross beam problem 2012-06-03 11:55:08 +02:00
Werner Schweer
47dfd3fded new beam code, fixes a cross beam problem 2012-06-03 11:55:08 +02:00
Werner Schweer
81a552eb87 qt5 port 2012-05-31 16:24:35 +02:00
Werner Schweer
5182c9e085 derive Element from QObject; add Q_OBJECT into every Element class 2012-05-28 11:29:21 +02:00
Werner Schweer
412ca45401 Initial commit 2012-05-26 14:49:10 +02:00
Werner Schweer
62c1703b18 Initial commit 2012-05-26 14:49:10 +02:00