소스 검색

Merge branch 'master' into simple_nodestore

Julius Pfrommer 9 년 전
부모
커밋
d9f99cf587
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      .travis.yml
  2. 1 1
      doc/tutorial_noderelations.rst

+ 1 - 1
.travis.yml

@@ -1,7 +1,7 @@
 language: c
 compiler:
 - gcc
-- clang
+#- clang
 os:
 - linux
 - osx

+ 1 - 1
doc/tutorial_noderelations.rst

@@ -247,7 +247,7 @@ After adding you XML file to CMakeLists.txt, rerun cmake in your build directory
   [ 10%] Generating src_generated/ua_transport_generated.c, src_generated/ua_transport_generated.h
   [ 13%] Generating src_generated/ua_namespaceinit_generated.c, src_generated/ua_namespaceinit_generated.h
 
-At this point, the make process will most likely hang for 30-60s until the namespace is parsed, checked, linked and finally generated (be pacient). It sould continue as follows::
+At this point, the make process will most likely hang for 30-60s until the namespace is parsed, checked, linked and finally generated (be patient). It should continue as follows::
   
   Scanning dependencies of target open62541-object
   [ 17%] Building C object CMakeFiles/open62541-object.dir/src/ua_types.c.o