Commit graph

6 commits

Author SHA1 Message Date
Ilari Liusvaara
4e2db8416d Merge branch 'rr1-maint'
Conflicts:
	include/core/movie.hpp
	src/platform/wxwidgets/editor-movie.cpp
2013-02-04 21:59:21 +02:00
Ilari Liusvaara
5eaa80a5f2 Merge branch 'rr1-maint'
This merges the basic movie editor functionality
2013-02-03 17:41:09 +02:00
Ilari Liusvaara
184e3fe7ff Clean up library includes 2012-11-13 22:01:12 +02:00
Ilari Liusvaara
aac0cd9a2c Move reset handling to cores
This removes special cases from movie code.
2012-10-17 14:35:36 +03:00
Ilari Liusvaara
4a4ec40019 Fix some really retarded code in library/movie 2012-10-17 00:05:37 +03:00
Ilari Liusvaara
e6dca4e9eb Refactor movie class to library/ 2012-10-12 15:21:57 +03:00