diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-02 18:31:34 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-02 18:31:34 +0200 |
commit | cf80e5b7471cfd5506319aa32e697c9688b1b4be (patch) | |
tree | 8bc703091652d2d53f07a6eb7b9a29d319071957 /ftnoir_protocol_ftn | |
parent | 4f05cb2af239ca8471b77c9f1d1c32e8c4cd3abc (diff) |
merge continues
Diffstat (limited to 'ftnoir_protocol_ftn')
-rw-r--r-- | ftnoir_protocol_ftn/ftn-protocol.qrc (renamed from ftnoir_protocol_ftn/protocol.qrc) | 2 | ||||
-rw-r--r-- | ftnoir_protocol_ftn/images/facetracknoir.ico | bin | 23558 -> 0 bytes | |||
-rw-r--r-- | ftnoir_protocol_ftn/images/facetracknoir.png | bin | 0 -> 634 bytes |
3 files changed, 1 insertions, 1 deletions
diff --git a/ftnoir_protocol_ftn/protocol.qrc b/ftnoir_protocol_ftn/ftn-protocol.qrc index b69d1f3f..18ae0aae 100644 --- a/ftnoir_protocol_ftn/protocol.qrc +++ b/ftnoir_protocol_ftn/ftn-protocol.qrc @@ -1,5 +1,5 @@ <RCC> <qresource prefix="/"> - <file>images/FaceTrackNoIR.ico</file> + <file>images/facetracknoir.png</file> </qresource> </RCC> diff --git a/ftnoir_protocol_ftn/images/facetracknoir.ico b/ftnoir_protocol_ftn/images/facetracknoir.ico Binary files differdeleted file mode 100644 index 5115066c..00000000 --- a/ftnoir_protocol_ftn/images/facetracknoir.ico +++ /dev/null diff --git a/ftnoir_protocol_ftn/images/facetracknoir.png b/ftnoir_protocol_ftn/images/facetracknoir.png Binary files differnew file mode 100644 index 00000000..b69a13ef --- /dev/null +++ b/ftnoir_protocol_ftn/images/facetracknoir.png |