erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-07 01:15:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge branch 'refactor/developer/6026-kmcompx-compiler-cross-platform-part-2-NEW_VERSION' of https://github.com/keymanapp/keyman into refactor/developer/6026-kmcompx-compiler-cross-platform-part-2-NEW_VERSION

Browse source 
# Conflicts:
#	developer/src/kmcmpdll/CheckNCapsConsistency.cpp
#	developer/src/kmcmpdll/UnreachableRules.cpp
#	developer/src/kmcmpdll/kmcmpdll.h

solved conflicts ( were only blanc lines)
This commit is contained in:
Sabine 2022-08-24 16:06:52 +02:00
commit 52d6629d58
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
developer/src/kmcmpdll/CheckNCapsConsistency.cpp
View file

@ -1,7 +1,7 @@
#include "pch.h"
#include <compfile.h>
#include <comperr.h>
#include <comperr.h>
#include <kmcmpdll.h>
#include "CharToKeyConversion.h"

1
developer/src/kmcmpdll/UnreachableRules.cpp
View file

@ -1,6 +1,5 @@
#include "pch.h"
#include <compfile.h>
#include <comperr.h>
#include "../../../common/windows/cpp/include/vkeys.h"

2
developer/src/kmcmpdll/kmcmpdll.h
View file

@ -1,7 +1,7 @@
#pragma once
//#include <windows.h>
#include "compfile.h"
#include <compfile.h>
KMX_BOOL AddCompileString(LPSTR buf);
KMX_BOOL AddCompileMessage(KMX_DWORD msg);