Vik Paruchuri 2612fc2bce Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui

2013-08-09 11:23:52 -04:00

..

test_files

Add TabsEditingDescriptor for VideoAlpha

2013-08-05 13:38:32 +03:00

xmodule

Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui

2013-08-09 11:23:52 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

setup.py

Changed back handling of Video by original Video code.

2013-08-09 09:22:57 +03:00