Cyp d39112244b Merge remote branch 'origin/master' into qt ... Conflicts: lib/framework/frame.h src/main.cpp		2011-01-22 23:05:36 +01:00
..
Makefile.am	Rename *.c to *.cpp.	2010-12-16 23:28:56 +01:00
makefile.win32	Rename *.c to *.cpp.	2010-12-16 23:28:56 +01:00
sequence.cpp	Merge remote branch 'origin/master' into qt	2011-01-22 23:05:36 +01:00
sequence.h	fix / add headers. merge sync: r11298	2010-07-28 18:59:26 +02:00
sequence.vcproj	Merge branch 'cpp' into qtcpp	2010-12-19 16:51:27 +01:00
timer.cpp	Merge branch 'cpp' into qtcpp	2010-12-19 16:51:27 +01:00
timer.h	fix / add headers. merge sync: r11298	2010-07-28 18:59:26 +02:00