seeseemelk/cool-retro-term
1
0
Fork 0
Code Issues 449 Pull Requests 12 Actions Packages Projects Releases 8 Wiki Activity

Fix merge conflicts.

Browse Source
This commit is contained in:
Filippo Scognamiglio
2015-01-20 01:13:26 +01:00
parent 1bcb85968b 265e19def8
commit 2911960482
12 changed files with 131 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/qml/resources.qrc
View File

@@ -52,5 +52,6 @@
<file>SettingsScreenTab.qml</file>
<file>fonts/modern-fixedsys-excelsior/FSEX301-L2.ttf</file>
<file>../icons/32x32/cool-retro-term.png</file>
<file>Components/SizedLabel.qml</file>
</qresource>
</RCC>