Tobias Doerffel f2876ea650 Merge remote-tracking branch 'origin/stable-1.1' ...

Conflicts:
	data/locale/zh.ts
	src/tracks/Pattern.cpp

2014-09-30 22:53:24 +02:00

..

unrtf

FlpImport/unrtf: renamed malloc.h to ur_malloc.h for not conflicting with system headers

2012-12-02 19:00:06 +01:00

CMakeLists.txt

File and class renames part 1

2009-08-25 01:30:41 +02:00

FlpImport.cpp

Merge remote-tracking branch 'origin/stable-1.1'

2014-09-30 22:53:24 +02:00

FlpImport.h

Added initial Qt5 support

2014-08-14 17:34:49 +02:00

unrtf.cpp

Added initial Qt5 support

2014-08-14 17:34:49 +02:00