Michael Ploujnikov e0d6f1ce66 Merge branch 'master' into second-tp-attempt ... Conflicts: src/proc/mobject/session/placement-index.cpp src/proc/mobject/session/placement-index.hpp		2010-01-14 21:06:14 -05:00
..
backend	Merge branch 'master' into second-tp-attempt	2010-01-14 19:32:07 -05:00
common	move the for_each helpers into a separate header	2009-12-29 04:39:27 +01:00
gui	include GUI work	2009-10-11 05:46:46 +02:00
include	new logging flag for the session	2009-11-22 04:35:37 +01:00
lib	fix compilation errors	2010-01-14 16:46:27 -05:00
lumiera	WIP some steps towards a solution of the memento binding problem	2009-06-29 06:33:42 +02:00
plugin
proc	Merge branch 'master' into second-tp-attempt	2010-01-14 21:06:14 -05:00
tool	Merge remote branch 'origin/master'	2010-01-12 08:05:12 -05:00
.gitignore
DIR_INFO
pre.hpp	remove any use of boost::function in favour of <tr1/functional>	2009-07-19 05:47:36 +02:00
pre_a.hpp	remove any use of boost::function in favour of <tr1/functional>	2009-07-19 05:47:36 +02:00