..
CGUIAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIAttributeEditor.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIAttributeEditor.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIBoolAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIColorAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIDummyEditorStub.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditFactory.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditFactory.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditWindow.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditWindow.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditWorkspace.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditWorkspace.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEnumAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIPanel.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIPanel.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIStringAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITextureAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITextureCacheBrowser.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITextureCacheBrowser.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMemoryReadWriteFile.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMemoryReadWriteFile.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
EGUIEditTypes.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc10.vcxproj
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc10.vcxproj.filters
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc11.vcxproj
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc11.vcxproj.filters
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc12.vcxproj
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc12.vcxproj.filters
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc14.vcxproj
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc14.vcxproj.filters
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUIEditor_gcc.cbp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
main.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Makefile
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00