Merge branch 'master' of gitenterprise.xilinx.com:SDx-Hub/apps into next

Conflicts: acceleration/prng/Makefile acceleration/prng/xrt.ini
zhihanxu · May 16, 2019 · 7fec468 · 7fec468
2 parents a926507 + 8045cde
commit 7fec468
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 825 deletions.
diff --git a/acceleration/prng/.gitignore b/acceleration/prng/.gitignore
diff --git a/acceleration/prng/Makefile b/acceleration/prng/Makefile
diff --git a/acceleration/prng/README.md b/acceleration/prng/README.md
diff --git a/acceleration/prng/description.json b/acceleration/prng/description.json
diff --git a/acceleration/prng/src/dma.cpp b/acceleration/prng/src/dma.cpp