Skip to content

[crfsuite] change /include/x.h => /include/crfsuite/x.h (#15785)#504

Merged
Jimmy-Hu merged 1 commit intoJimmy-Hu:masterfrom
microsoft:master
Jan 21, 2021
Merged

[crfsuite] change /include/x.h => /include/crfsuite/x.h (#15785)#504
Jimmy-Hu merged 1 commit intoJimmy-Hu:masterfrom
microsoft:master

Conversation

@Jimmy-Hu
Copy link
Copy Markdown
Owner

Merge from microsoft/vcpkg

This caused conflicts with many ports; in particular params.h conflicted with tesseract.

   crfsuite:/include/cqdb.h
   crfsuite:/include/crf1d.h
   crfsuite:/include/crfsuite.h
   crfsuite:/include/crfsuite.hpp
   crfsuite:/include/crfsuite_api.hpp
   crfsuite:/include/crfsuite_internal.h
   crfsuite:/include/iwa.h
   crfsuite:/include/logging.h
   crfsuite:/include/option.h
   crfsuite:/include/os.h
   crfsuite:/include/params.h    ***
   crfsuite:/include/quark.h
   crfsuite:/include/readdata.h
   crfsuite:/include/rumavl.h
   crfsuite:/include/vecmath.h
@Jimmy-Hu Jimmy-Hu merged commit 9ffadfd into Jimmy-Hu:master Jan 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants