diff options
| author | Adel Vilkov <[email protected]> | 2019-04-15 12:40:10 +0300 |
|---|---|---|
| committer | Adel Vilkov <[email protected]> | 2019-04-15 12:40:10 +0300 |
| commit | f84cdec174d7bf9b3247397b072e46c1d3b1e2b1 (patch) | |
| tree | 9885df74e55ce4ad57e4c8191a4d8dc44c65ba74 | |
| parent | 072f9bfe34c02a9f855497e4f2b15602d2c6d9a3 (diff) | |
| parent | 3f990875386c52be7712d0e56debf4eab4c88b9a (diff) | |
Merge branch 'feature/clib-integration' of github.com:RaZeR-RBI/xmake into feature/clib-integration
Conflicts:
xmake/modules/package/manager/clib/find_package.lua
xmake/modules/package/manager/clib/install_package.lua
0 files changed, 0 insertions, 0 deletions