Skip to content

Commit

Permalink
Merge branch 'jetson-mipi' of https://github.com/fastvideo/gpu-camera…
Browse files Browse the repository at this point in the history 
…-sample.git

# Conflicts:
#	src/CameraSample/CameraSample.pro
#	src/CameraSample/MainWindow.cpp
#	src/common_defs.pri
  • Loading branch information
@AlexVRom
AlexVRom committed May 18, 2022
2 parents 6cfb3cf + 4dd0ceb commit 6a9522f
Show file tree
Hide file tree
Showing 3 changed files with 569 additions and 1 deletion.

0 comments on commit 6a9522f

Please sign in to comment.