Merge continued

git-svn-id: svn://ultimatepp.org/upp/trunk@10263 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-10-04 08:34:39 +00:00
parent adf46bd64e
commit 2e4b276e07
3860 changed files with 1161787 additions and 438 deletions

View file

@ -0,0 +1,4 @@
LAYOUT(ThreadedImageLoaderLayout, 220, 190)
ITEM(ImageDisplayCtrl, display, HSizePosZ(4, 4).VSizePosZ(4, 26))
ITEM(EditField, time, SetEditable(false).HSizePosZ(2, 4).BottomPosZ(3, 19))
END_LAYOUT