2 commits

Author	SHA1	Message	Date
Marc Zinnschlag	db29e411c4	added merge functions; temporarily merge on document creation	2012-12-03 13:56:02 +01:00
Marc Zinnschlag	ef9575498f	basic (non-editable) subview for global variables	2012-11-26 12:29:22 +01:00