Marc Zinnschlag 1b663f01af create merged document and open a view for it (document is still empty at this point)		2015-08-16 15:24:48 +02:00
..
doc	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
filter
settings	Update to upstream/master. Resolve merge conflicts	2015-07-27 13:54:13 +03:00
tools	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
world