diff options
| author | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
|---|---|---|
| committer | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
| commit | 0669a40347ffa233bc6042b0f65d244509a61394 (patch) | |
| tree | 36a4577bdaa1ed28ca1ad222a54777012dd2dda8 /facetracknoir/uielements | |
| parent | 72540e0a96a3120a5d02271e714aba29e136ab78 (diff) | |
| parent | 7454496476ba17ea622781d280606161581c9544 (diff) | |
Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2
Resolved conflicts manually in files:
ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
Diffstat (limited to 'facetracknoir/uielements')
| -rw-r--r-- | facetracknoir/uielements/logo_facetracknoir_32px.jpg | bin | 1082 -> 0 bytes |
| -rw-r--r-- | facetracknoir/uielements/logo_facetracknoir_32px.png | bin | 2822 -> 0 bytes |
| -rw-r--r-- | facetracknoir/uielements/logo_noir.png | bin | 26173 -> 0 bytes |
| -rw-r--r-- | facetracknoir/uielements/logo_noir_small.png | bin | 6384 -> 0 bytes |
| -rw-r--r-- | facetracknoir/uielements/logo_noir_small_target.png | bin | 5971 -> 0 bytes |
| -rw-r--r-- | facetracknoir/uielements/logo_noir_small_target90px.png | bin | 5582 -> 0 bytes |
| -rw-r--r-- | facetracknoir/uielements/logofacetracknoir.png | bin | 5437 -> 0 bytes |
| -rw-r--r-- | facetracknoir/uielements/logofacetracknoir60px.png | bin | 3369 -> 0 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/facetracknoir/uielements/logo_facetracknoir_32px.jpg b/facetracknoir/uielements/logo_facetracknoir_32px.jpg Binary files differdeleted file mode 100644 index 73ead853..00000000 --- a/facetracknoir/uielements/logo_facetracknoir_32px.jpg +++ /dev/null diff --git a/facetracknoir/uielements/logo_facetracknoir_32px.png b/facetracknoir/uielements/logo_facetracknoir_32px.png Binary files differdeleted file mode 100644 index c4e63c76..00000000 --- a/facetracknoir/uielements/logo_facetracknoir_32px.png +++ /dev/null diff --git a/facetracknoir/uielements/logo_noir.png b/facetracknoir/uielements/logo_noir.png Binary files differdeleted file mode 100644 index bb654a07..00000000 --- a/facetracknoir/uielements/logo_noir.png +++ /dev/null diff --git a/facetracknoir/uielements/logo_noir_small.png b/facetracknoir/uielements/logo_noir_small.png Binary files differdeleted file mode 100644 index 5d49e0b1..00000000 --- a/facetracknoir/uielements/logo_noir_small.png +++ /dev/null diff --git a/facetracknoir/uielements/logo_noir_small_target.png b/facetracknoir/uielements/logo_noir_small_target.png Binary files differdeleted file mode 100644 index 4bbaf41f..00000000 --- a/facetracknoir/uielements/logo_noir_small_target.png +++ /dev/null diff --git a/facetracknoir/uielements/logo_noir_small_target90px.png b/facetracknoir/uielements/logo_noir_small_target90px.png Binary files differdeleted file mode 100644 index ecaa4e12..00000000 --- a/facetracknoir/uielements/logo_noir_small_target90px.png +++ /dev/null diff --git a/facetracknoir/uielements/logofacetracknoir.png b/facetracknoir/uielements/logofacetracknoir.png Binary files differdeleted file mode 100644 index a1a3407b..00000000 --- a/facetracknoir/uielements/logofacetracknoir.png +++ /dev/null diff --git a/facetracknoir/uielements/logofacetracknoir60px.png b/facetracknoir/uielements/logofacetracknoir60px.png Binary files differdeleted file mode 100644 index f01f6024..00000000 --- a/facetracknoir/uielements/logofacetracknoir60px.png +++ /dev/null |
