Merge branch 'dronestream-module' · 993bd0ac2d - ardrone-webflight - Wellton Git

wellton/ardrone-webflight

Merge branch 'dronestream-module'

Ver Código-Fonte

Conflicts:
	plugins/video-stream/public/js/nodecopter-client.js

Esse commit está contido em:

Bernhard K. Weisshuhn

2013-08-11 15:15:45 +02:00

pai eaf8c7f833 b7b8272c83

commit 993bd0ac2d

1 arquivos alterados com 3 adições e 0 exclusões

									
										plugins/video-stream/public/js/nodecopter-client.js
									
		+3
		
												Ver Arquivo
												
					@@ -0,0 +1,3 @@

					/* this is a dummy file that is replaced with dist/nodecopter-client.js

					 * from the dronestream module by express.

					 */