Steven Miers 4e40da594c Merge with develop again		2015-08-31 10:12:18 -05:00
..
AppActions.js.coffee	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
BroadcastActions.js.coffee	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
JamTrackActions.js.coffee	Merge with develop	2015-08-29 12:56:27 -05:00
JamTrackPreviewActions.js.coffee	Merge with develop	2015-08-29 12:56:27 -05:00
MediaPlaybackActions.js.coffee	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
MixerActions.js.coffee	* VRFS-3356, VRFS-3371 - deal with async timing issues for self and remote peers as you join a session	2015-07-23 21:00:39 -05:00
NotificationActions.js.coffee	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
RecordingActions.js.coffee	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
SessionActions.js.coffee	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
SessionMyTracksActions.js.coffee	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
TeacherActions.js.coffee	VRFS-3359 : Solid navigation for teacher setup steps.	2015-08-14 16:56:36 -05:00
VideoActions.js.coffee	Merge with develop again	2015-08-31 10:12:18 -05:00