Davide P. Cervone a675b397c7 Merge branch 'issue138' into v2.0-candidate (resolving conflicts, and fixing some issues with zoom and menus)		2011-09-11 14:43:21 -04:00
..
element/mml	Merge branch 'new-features' into merge-features (in preparation for merging with v2.0-candidate), and fix hover zoom trigger when discoverability is disabled	2011-09-11 12:42:27 -04:00
input	Merge branch 'new-features' into merge-features (in preparation for merging with v2.0-candidate), and fix hover zoom trigger when discoverability is disabled	2011-09-11 12:42:27 -04:00
output	Merge branch 'issue138' into v2.0-candidate (resolving conflicts, and fixing some issues with zoom and menus)	2011-09-11 14:43:21 -04:00