Code Review / apps / mixer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: d9bb450) | patch
Merge 'eel' into 'master' 31/14731/1
authorLoïc Collignon <loic.collignon@iot.bzh>
Wed, 27 Jun 2018 15:30:37 +0000 (17:30 +0200)
committerLoïc Collignon <loic.collignon@iot.bzh>
Wed, 27 Jun 2018 15:30:37 +0000 (17:30 +0200)
commit63dc51c35d26c837295ac0ef33c1b8e41353ea35
tree24918fe062c14b29f1c69b2e024cb8d66d045c50tree | snapshot
parentd9bb450ee8898cb810027897a32afd3adcb05d9fcommit | diff
Merge 'eel' into 'master'

Replace content from 'master' by content from 'eel' as it's the new
version based on 4a on which new development will be done.

Change-Id: I2966af7dcee59701ff3a344487c008d7e65e68ed
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
24 files changed:
.gitignore diff | blob | history
.gitmodules [new file with mode: 0644] blob
CMakeLists.txt [new file with mode: 0644] blob
afb-helpers [new submodule] blob
app/CMakeLists.txt [new file with mode: 0644] blob
app/Mixer.qml diff | blob | history
app/app.pri [deleted file] blob | history
app/app.pro [deleted file] blob | history
app/main.cpp diff | blob | history
app/mixer.cpp [new file with mode: 0644] blob
app/mixer.h [new file with mode: 0644] blob
app/paclient.cpp [deleted file] blob | history
app/paclient.h [deleted file] blob | history
app/pacontrolmodel.cpp [deleted file] blob | history
app/pacontrolmodel.h [deleted file] blob | history
conf.d/app-templates [new submodule] blob
conf.d/autobuild/agl/autobuild [new file with mode: 0755] blob
conf.d/autobuild/linux/autobuild [new file with mode: 0755] blob
conf.d/cmake/config.cmake [new file with mode: 0644] blob
conf.d/wgt/config.xml.in [new file with mode: 0644] blob
conf.d/wgt/icon.svg [moved from package/icon.svg with 100% similarity] blob | history
mixer.pro [deleted file] blob | history
package/config.xml [deleted file] blob | history
package/package.pro [deleted file] blob | history
Mixer reference application