projects
/
lichviet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop'
[lichviet]
/
lichviet.qrc
diff --git
a/lichviet.qrc
b/lichviet.qrc
index
36718f2
..
4acb97c
100644
(file)
--- a/
lichviet.qrc
+++ b/
lichviet.qrc
@@
-15,9
+15,11
@@
<file>qml/LichViet/ToolBarSingle.qml</file>
<file>qml/LichViet/XemNgayTotXauHoangDao.qml</file>
<file>qml/LichViet/DateTimeDialog.qml</file>
<file>qml/LichViet/ToolBarSingle.qml</file>
<file>qml/LichViet/XemNgayTotXauHoangDao.qml</file>
<file>qml/LichViet/DateTimeDialog.qml</file>
- <file>qml/LichViet/AmDateTimeDialog.qml</file>s
- <file>qml/LichViet/NoFeatureDialog.qml</file>
-
+ <file>qml/LichViet/AmDateTimeDialog.qml</file>s
+ <file>qml/LichViet/ChangeTheme.qml</file>
+ <file>qml/LichViet/MenuButton.qml</file>
+ <file>qml/LichViet/ScrollBar.qml</file>
+ <file>qml/LichViet/FileBrowser.qml</file>
<file>qml/DatePicker/component/Button.qml</file>
<file>qml/DatePicker/component/DateReel.qml</file>
<file>qml/DatePicker/component/Reel.qml</file>
<file>qml/DatePicker/component/Button.qml</file>
<file>qml/DatePicker/component/DateReel.qml</file>
<file>qml/DatePicker/component/Reel.qml</file>
@@
-25,10
+27,11
@@
<file>LichViet.png</file>
<file>qml/LichViet/amlich-hnd.js</file>
<file>LichViet.png</file>
<file>qml/LichViet/amlich-hnd.js</file>
- <file>qml/LichViet/amlich-aa98.js</file>
+ <file>qml/LichViet/amlich-aa98.js</file>
<file>qml/LichViet/Settings.js</file>
<file>qml/LichViet/Themes.js</file>
<file>qml/LichViet/Settings.js</file>
<file>qml/LichViet/Themes.js</file>
- <file>qml/LichViet/xemngaytotxau.js</file>
+ <file>qml/LichViet/xemngaytotxau.js</file>
+ <file>qml/LichViet/CacNgayLeTrongNam.js</file>
</qresource>
</RCC>
</qresource>
</RCC>