aboutsummaryrefslogtreecommitdiff
path: root/Client/Resources/ui
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-12-03 11:40:14 +0800
committerchai <chaifix@163.com>2021-12-03 11:40:14 +0800
commite8e2283d264be24fc2f69d536b4bf58d3c403616 (patch)
tree9f1ab6fa618d22cac7f01de911a0e341e38907a3 /Client/Resources/ui
parente9ff46e5c8cc1646eb780e64d01be7b3430a628c (diff)
parentd9bd02c2471ec14c52df65cf7b5c106eddabe080 (diff)
Merge branch 'master' of warmcat.org:/home/git-repo/PND
# Conflicts: # Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters # Client/Project/VisualStudio/Phy2Dlite/imgui.ini
Diffstat (limited to 'Client/Resources/ui')
-rw-r--r--Client/Resources/ui/hello.ui3
1 files changed, 3 insertions, 0 deletions
diff --git a/Client/Resources/ui/hello.ui b/Client/Resources/ui/hello.ui
new file mode 100644
index 0000000..14a5c30
--- /dev/null
+++ b/Client/Resources/ui/hello.ui
@@ -0,0 +1,3 @@
+{
+ "name" : "hello screen"
+} \ No newline at end of file