bigbluebutton-Github/labs/meteor-client/client/whiteboard_models
Anton Georgiev 9d5000e636 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates
Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/main.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
	labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
2014-08-12 18:53:50 +00:00
..
_whiteboard_tool.coffee moved the code from the whiteboard prototype to the html5 client. Now will start integrating it 2014-07-29 19:23:16 +00:00
utils.coffee moved the code from the whiteboard prototype to the html5 client. Now will start integrating it 2014-07-29 19:23:16 +00:00
whiteboard_cursor.coffee moved the code from the whiteboard prototype to the html5 client. Now will start integrating it 2014-07-29 19:23:16 +00:00
whiteboard_ellipse.coffee Fixed some errors 2014-08-01 08:01:44 -07:00
whiteboard_line.coffee Fixed some errors 2014-08-01 08:01:44 -07:00
whiteboard_paper.coffee Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 2014-08-12 18:53:50 +00:00
whiteboard_rect.coffee moved the code from the whiteboard prototype to the html5 client. Now will start integrating it 2014-07-29 19:23:16 +00:00
whiteboard_slide.coffee moved the code from the whiteboard prototype to the html5 client. Now will start integrating it 2014-07-29 19:23:16 +00:00
whiteboard_text.coffee moved the code from the whiteboard prototype to the html5 client. Now will start integrating it 2014-07-29 19:23:16 +00:00
whiteboard_triangle.coffee Fixed some errors 2014-08-01 08:01:44 -07:00