Permalink
Browse files

Recovers the media framework out of experimental, since it's been upd…

…ated significantly and will be better served staying in a public spot for now.
  • Loading branch information...
1 parent 9eb968c commit c9bf4139f7b29ff3394df0c6651c432cd9dfa235 @publickeating publickeating committed Sep 23, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 {frameworks/experimental → }/apps/media_examples/Buildfile
  2. 0 {frameworks/experimental → }/apps/media_examples/core.js
  3. 0 {frameworks/experimental → }/apps/media_examples/resources/loading.rhtml
  4. 0 {frameworks/experimental → }/apps/media_examples/resources/main_page.js
  5. 0 {frameworks/experimental → }/apps/media_examples/views/audio_view.js
  6. 0 {frameworks/experimental → }/apps/media_examples/views/camera_view.js
  7. 0 {frameworks/experimental → }/apps/media_examples/views/capabilities_view.js
  8. 0 {frameworks/experimental → }/apps/media_examples/views/microphone_view.js
  9. 0 {frameworks/experimental → }/apps/media_examples/views/video_view.js
  10. 0 frameworks/{experimental/frameworks → }/media/.greenhouseconf
  11. 0 frameworks/{experimental/frameworks → }/media/media_capabilities.js
  12. 0 frameworks/{experimental/frameworks → }/media/render_delegates/media_slider.js
  13. BIN frameworks/{experimental/frameworks → }/media/resources/controls.png
  14. BIN frameworks/{experimental/frameworks → }/media/resources/playeras3.fla
  15. 0 frameworks/{experimental/frameworks → }/media/resources/video.css
  16. BIN frameworks/{experimental/frameworks → }/media/resources/videoCanvas.swf
  17. 0 frameworks/{experimental/frameworks → }/media/tests/media_capabilities.js
  18. 0 frameworks/{experimental/frameworks → }/media/views/audio.js
  19. 0 frameworks/{experimental/frameworks → }/media/views/controls.js
  20. 0 frameworks/{experimental/frameworks → }/media/views/media_slider.js
  21. 0 frameworks/{experimental/frameworks → }/media/views/mini_controls.js
  22. 0 frameworks/{experimental/frameworks → }/media/views/simple_controls.js
  23. 0 frameworks/{experimental/frameworks → }/media/views/video.js
@@ -9,5 +9,5 @@
# Buildfile, which contains default settings for all apps in your project.
# It is better to add :required targets here than in the global Buildfile.
-config :media_examples, :required => [ :sproutcore, :"experimental/media" ]
+config :media_examples, :required => [ :sproutcore, :media ]

0 comments on commit c9bf413

Please sign in to comment.