[*] Conflicts resolved
Showing
- general/chroot_wrap.sh 5 additions, 0 deletionsgeneral/chroot_wrap.sh
- general/update_dashboard.sh 21 additions, 0 deletionsgeneral/update_dashboard.sh
- linux/debian/conf/dependencies 1 addition, 1 deletionlinux/debian/conf/dependencies
- linux/debian/conf/publish 1 addition, 1 deletionlinux/debian/conf/publish
- linux/debian/essentials/postinst 1 addition, 1 deletionlinux/debian/essentials/postinst
- linux/debian/scripts/compile_and_pack.sh 7 additions, 1 deletionlinux/debian/scripts/compile_and_pack.sh
- linux/debian/scripts/deploy.sh 3 additions, 1 deletionlinux/debian/scripts/deploy.sh
- linux/ubuntu/conf/publish 1 addition, 1 deletionlinux/ubuntu/conf/publish
- mac/scripts/compile.sh 13 additions, 0 deletionsmac/scripts/compile.sh
- windows/conf/win_libs 1 addition, 0 deletionswindows/conf/win_libs
- windows/scripts/compile.bat 5 additions, 0 deletionswindows/scripts/compile.bat
- windows/scripts/compile.sh 28 additions, 0 deletionswindows/scripts/compile.sh
Loading
Please register or sign in to comment