kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/7/kinect1Support

Browse Source 
# Conflicts:
#	settings.gradle
This commit is contained in:
Kazik Pogoda
2019-08-26 10:25:47 +02:00
parent af119b3b26 98baf2a4c3
commit e3446841ed
8 changed files with 153 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
settings.gradle
View File

@@ -1,23 +1,25 @@
rootProject.name = 'orx'
include 'orx-camera',
'orx-compositor',
'orx-easing',
'orx-file-watcher',
'orx-filter-extension',
'orx-integral-image',
'orx-interval-tree',
'orx-jumpflood',
'orx-kdtree',
'orx-mesh-generators',
'orx-midi',
'orx-no-clear',
'orx-noise',
'orx-obj-loader',
'orx-olive',
'orx-kinect-common',
'orx-kinect-v1',
'orx-kinect-v1-natives-linux-x64',
'orx-kinect-v1-natives-macos',
'orx-kinect-v1-natives-windows',
'orx-kinect-v1-demo'
'orx-compositor',
'orx-easing',
'orx-file-watcher',
'orx-filter-extension',
'orx-integral-image',
'orx-interval-tree',
'orx-jumpflood',
'orx-kdtree',
'orx-mesh-generators',
'orx-midi',
'orx-no-clear',
'orx-noise',
'orx-obj-loader',
'orx-olive',
'orx-shader-phrases',
'orx-shader-phrases-processor',
'orx-kinect-common',
'orx-kinect-v1',
'orx-kinect-v1-natives-linux-x64',
'orx-kinect-v1-natives-macos',
'orx-kinect-v1-natives-windows',
'orx-kinect-v1-demo'