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 /ftnoir_protocol_sc/ftnoir-protocol-sc.rc | |
| 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 'ftnoir_protocol_sc/ftnoir-protocol-sc.rc')
| -rw-r--r-- | ftnoir_protocol_sc/ftnoir-protocol-sc.rc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ftnoir_protocol_sc/ftnoir-protocol-sc.rc b/ftnoir_protocol_sc/ftnoir-protocol-sc.rc index 3b43715e..80b6c12c 100644 --- a/ftnoir_protocol_sc/ftnoir-protocol-sc.rc +++ b/ftnoir_protocol_sc/ftnoir-protocol-sc.rc @@ -1,2 +1,4 @@ #include <winuser.h> -142 RT_MANIFEST scserver.manifest
\ No newline at end of file +142 RT_MANIFEST scserver.manifest +143 RT_MANIFEST scserver-sp2.manifest +144 RT_MANIFEST scserver-acceleration.manifest
\ No newline at end of file |