Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-05-28 05:31:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-lubosz/tests
History
Brad Davis fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
2015-04-24 18:02:12 -07:00
..
audio remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
jitter Merge pull request #4300 from birarda/dependencies 2015-02-25 13:22:49 -08:00
networking remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
octree Rename CollisionModelURL handle 2015-04-22 21:03:56 +02:00
physics remove SHAPE_TYPE_CONVEX_HULL from libs and tests 2015-04-14 14:54:43 -07:00
render-utils Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
shared remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
ui Merge branch 'ui-refactor' into m_and_m 2015-04-24 18:02:12 -07:00
CMakeLists.txt Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00