Menu

Commit [r625]  Maximize  Restore  History

I have now merged my changes with Bruno's revision 624 from the trunk

onar3d@gmail.com 2013-04-30

1 2 > >> (Page 1 of 2)
changed /branches/agalma/CMakeLists.txt.user
changed /branches/agalma/libQtProperty/CMakeLists.txt
changed /branches/agalma/shaders/imageProcessing_fragment.glsl
changed /branches/agalma/shaders/imageProcessing_fragment_simplified.glsl
changed /branches/agalma/src/AlgorithmSelectionDialog.cpp
changed /branches/agalma/src/AlgorithmSource.h
changed /branches/agalma/src/CMakeLists.txt
changed /branches/agalma/src/GeometryView.cpp
changed /branches/agalma/src/LayersView.cpp
changed /branches/agalma/src/MixerView.cpp
changed /branches/agalma/src/MixingToolboxWidget.cpp
changed /branches/agalma/src/MixingToolboxWidget.h
changed /branches/agalma/src/MixingToolboxWidget.ui
changed /branches/agalma/src/OutputRenderWindow.cpp
changed /branches/agalma/src/OutputRenderWindow.h
changed /branches/agalma/src/RenderingManager.cpp
changed /branches/agalma/src/RenderingManager.h
changed /branches/agalma/src/Source.cpp
changed /branches/agalma/src/Source.h
changed /branches/agalma/src/SourcePropertyBrowser.cpp
changed /branches/agalma/src/UserPreferencesDialog.cpp
changed /branches/agalma/src/UserPreferencesDialog.h
changed /branches/agalma/src/UserPreferencesDialog.ui
changed /branches/agalma/src/VideoSource.h
changed /branches/agalma/src/ViewRenderWidget.cpp
/branches/agalma/CMakeLists.txt.user Diff Switch to side-by-side view
Loading...
/branches/agalma/libQtProperty/CMakeLists.txt Diff Switch to side-by-side view
Loading...
/branches/agalma/shaders/imageProcessing_fragment.glsl Diff Switch to side-by-side view
Loading...
/branches/agalma/shaders/imageProcessing_fragment_simplified.glsl Diff Switch to side-by-side view
Loading...
/branches/agalma/src/AlgorithmSelectionDialog.cpp Diff Switch to side-by-side view
Loading...
/branches/agalma/src/AlgorithmSource.h Diff Switch to side-by-side view
Loading...
/branches/agalma/src/CMakeLists.txt Diff Switch to side-by-side view
Loading...
/branches/agalma/src/GeometryView.cpp Diff Switch to side-by-side view
Loading...
/branches/agalma/src/LayersView.cpp Diff Switch to side-by-side view
Loading...
/branches/agalma/src/MixerView.cpp Diff Switch to side-by-side view
Loading...
/branches/agalma/src/MixingToolboxWidget.cpp Diff Switch to side-by-side view
Loading...
/branches/agalma/src/MixingToolboxWidget.h Diff Switch to side-by-side view
Loading...
/branches/agalma/src/MixingToolboxWidget.ui Diff Switch to side-by-side view
Loading...
/branches/agalma/src/OutputRenderWindow.cpp Diff Switch to side-by-side view
Loading...
/branches/agalma/src/OutputRenderWindow.h Diff Switch to side-by-side view
Loading...
/branches/agalma/src/RenderingManager.cpp Diff Switch to side-by-side view
Loading...
/branches/agalma/src/RenderingManager.h Diff Switch to side-by-side view
Loading...
/branches/agalma/src/Source.cpp Diff Switch to side-by-side view
Loading...
/branches/agalma/src/Source.h Diff Switch to side-by-side view
Loading...
/branches/agalma/src/SourcePropertyBrowser.cpp Diff Switch to side-by-side view
Loading...
/branches/agalma/src/UserPreferencesDialog.cpp Diff Switch to side-by-side view
Loading...
/branches/agalma/src/UserPreferencesDialog.h Diff Switch to side-by-side view
Loading...
/branches/agalma/src/UserPreferencesDialog.ui Diff Switch to side-by-side view
Loading...
/branches/agalma/src/VideoSource.h Diff Switch to side-by-side view
Loading...
/branches/agalma/src/ViewRenderWidget.cpp Diff Switch to side-by-side view
Loading...
1 2 > >> (Page 1 of 2)