Commit Graph

4805 Commits

Author SHA1 Message Date
Dave French
3db3711dcf fix for 1668 now checks if save to load song 2015-01-22 18:31:09 +00:00
Dave French
9460fdec9b Proposed fix 1643 Allow drag-and-drop of project files 2015-01-21 13:18:01 +00:00
Tres Finocchiaro
c13d111bc2 Merge pull request #1657 from DanWin/songeditor
Fix SongEditorWindow resize when a project loads
2015-01-19 11:53:40 -05:00
Daniel Winzen
a3e5a65957 Fix SongEditorWindow resize when a project loads 2015-01-19 15:32:16 +01:00
Tres Finocchiaro
ce0b258d5e Merge pull request #1653 from teeberg/master
Format and reword README
2015-01-19 08:55:23 -05:00
Tres Finocchiaro
d9b81bc9e2 Merge pull request #1654 from curlymorphic/i818
Proposed fix 818 Merge file name and preset name. Remove double naming
2015-01-19 08:44:49 -05:00
Jonas Trappenberg
4e92243508 Update copyright year 2015-01-18 14:08:13 -08:00
Dave French
746ea39afb Proposed fix 818 Merge file name and preset name. Remove double naming 2015-01-18 21:39:09 +00:00
Jonas Trappenberg
a4536c43a5 Format and slightly reword READMEs 2015-01-18 12:48:03 -08:00
Jonas Trappenberg
018457340e Bump version number in README 2015-01-18 12:47:43 -08:00
Tres Finocchiaro
9f75aabf65 Merge pull request #1646 from DanWin/delete
Use delete[] instead of delete for sampleFrame
2015-01-16 15:16:39 -05:00
Daniel Winzen
9c8e2b195c Use delete[] instead of delete for sampleFrame
Fixes warning: 'delete' applied to a pointer-to-array type 'sampleFrame *' (aka 'sample_t (*)[2]') treated as delete[] in mac os build
2015-01-16 20:24:24 +01:00
Lukas W
2257a06422 Fix a segfault 2015-01-16 19:57:31 +01:00
Lukas W
4953a9da60 Merge pull request #1637 from LMMS/travis-osx
Travis OSX
2015-01-16 01:15:47 +01:00
Lukas W
f492a8ab0e Detect failed tests 2015-01-16 01:15:02 +01:00
Lukas W
59513f9a49 Fix that CMake version check again 2015-01-16 00:25:10 +01:00
Lukas W
b5019e53d1 Travis: Re-enable linux builds 2015-01-16 00:04:09 +01:00
Lukas W
85d7843c98 Tests: Fix CMake version check 2015-01-15 23:10:28 +01:00
Lukas W
fb2df20095 Merge branch 'master' into travis-osx 2015-01-15 22:47:58 +01:00
Lukas W
7e43541fe5 Travis: Fix script path error 2015-01-15 22:34:51 +01:00
Lukas W
eea616f080 Travis: Disable linux builds (temporarily) 2015-01-15 22:26:04 +01:00
Lukas W
4c0705359a OSX fix try #2 2015-01-15 22:23:26 +01:00
Lukas W
bd4a93c1d7 Travis: Outsource build scripts 2015-01-15 22:05:10 +01:00
Lukas W
d4d26a6138 OSX fix 2015-01-15 21:35:46 +01:00
Lukas W
c7e3ab3d46 Don't use QList's initializer_list constructor (compat commit) 2015-01-15 21:24:23 +01:00
Lukas W
4cfba53f71 Travis update
Try removing that unnecessary linux job
2015-01-15 21:22:33 +01:00
Tres Finocchiaro
57876fead2 Merge pull request #1611 from curlymorphic/i760
Proposed fix 760  Improve search field
2015-01-15 15:03:43 -05:00
Lukas W
f15f8ce3df Travis: Fix brew 2015-01-15 20:51:15 +01:00
Lukas W
bb24f61042 Travis: Fix yml syntax errors 2015-01-15 20:44:56 +01:00
Lukas W
b862b34a9a Travis: Enable OSX 2015-01-15 20:38:53 +01:00
Lukas W
ebf68d57a9 ProjectVersion: Some refactoring 2015-01-15 17:27:58 +01:00
Lukas W
a18f86bde7 ProjectVersion: Clean up a bit, add a test 2015-01-15 17:27:58 +01:00
Lukas W
a52e4724cf Some small SongEditor fixes 2015-01-15 17:27:57 +01:00
Lukas W
b720ec5537 Merge pull request #1618 from teeberg/master
More minor code style cleanup
2015-01-15 17:20:22 +01:00
Vesa
89e8e328e6 Merge branch 'stable-1.1' 2015-01-15 17:18:03 +02:00
Vesa
e33645f9ab Fix monstro slopes 2015-01-15 17:17:33 +02:00
Vesa V
9cff69cb78 Merge pull request #1635 from diizy/master
Fix monstro slopes properly
2015-01-15 17:15:06 +02:00
Vesa
c0932bd75e Fix monstro slopes properly 2015-01-15 17:14:50 +02:00
Lukas W
7ac591fdfe Merge pull request #1626 from LMMS/cmake_tests
CMake: Change the way tests links lmms
2015-01-15 16:13:49 +01:00
Vesa V
663dcbf98f Merge pull request #1624 from dnl-music/patch-4
Update Monstro.h
2015-01-15 17:08:12 +02:00
Vesa V
fe73f0991f Merge pull request #1623 from dnl-music/patch-3
Update Monstro.cpp
2015-01-15 17:08:03 +02:00
Lukas W
b90ee93d0c Travis: Upgrade CMake from PPA 2015-01-15 16:03:52 +01:00
Lukas W
ff882e021e Disable tests for CMake <2.8.8 2015-01-15 15:57:50 +01:00
Jonas Trappenberg
7f38a51f9d Merge remote-tracking branch 'upstream/master' 2015-01-14 21:07:36 -08:00
Tres Finocchiaro
d6e98499d0 Merge pull request #1629 from tresf/master
Add CPU prioritization support for Windows
2015-01-14 22:31:42 -05:00
Tres Finocchiaro
d89b54d768 Add CPU prioritization support for Windows 2015-01-14 14:33:21 -05:00
Lukas W
030292cbad Merge pull request #1582 from tresf/master
ProjectVersion: Expose major/minor/release/build info
2015-01-14 20:26:43 +01:00
Lukas W
2f7820a6d9 CMake: Change the way tests links lmms 2015-01-14 19:54:48 +01:00
dnl-music
e3ebef08a9 Update Monstro.h 2015-01-14 17:09:38 +05:00
dnl-music
26592907e6 Update Monstro.cpp 2015-01-14 17:06:07 +05:00