Showing
1 changed file
with
6 additions
and
0 deletions
... | @@ -11,9 +11,15 @@ Supported Platforms & Test Environments | ... | @@ -11,9 +11,15 @@ Supported Platforms & Test Environments |
11 | --------------------------------------------------------------------------------------------------------------------------------- | 11 | --------------------------------------------------------------------------------------------------------------------------------- |
12 | 12 | ||
13 | >Raspberry Pi 3 Model B. | 13 | >Raspberry Pi 3 Model B. |
14 | +<<<<<<< HEAD | ||
14 | >Raspberry Pi Camera Rev. 1.3. | 15 | >Raspberry Pi Camera Rev. 1.3. |
15 | >Ubuntu MATE 16.04.2. | 16 | >Ubuntu MATE 16.04.2. |
16 | >C++ Compiler Version 11 or higher | 17 | >C++ Compiler Version 11 or higher |
18 | +======= | ||
19 | +>Paspberry Pi Camera Rev. 1.3. | ||
20 | +>Ubuntu MATE 16.04.2. | ||
21 | +>C++ 컴파일러 버전 11이상 | ||
22 | +>>>>>>> 7ae2f6f96ccdbaa7951773ba4ad6afd579701e65 | ||
17 | 23 | ||
18 | 24 | ||
19 | Application Project Setup | 25 | Application Project Setup | ... | ... |
-
Please register or login to post a comment