Skip to content
Snippets Groups Projects
  1. Oct 26, 2020
  2. Oct 22, 2020
  3. Oct 21, 2020
  4. Oct 20, 2020
  5. Oct 19, 2020
  6. Oct 16, 2020
  7. Oct 15, 2020
  8. Oct 13, 2020
  9. Oct 12, 2020
  10. Sep 29, 2020
    • Alexandr Mruchok's avatar
      Merge remote-tracking branch 'origin/develop' · 779f5c64
      Alexandr Mruchok authored
      # Conflicts:
      #	.gitmodules
      #	CellFrameDashboardGUI/CellFrameDashboardGUI.pro
      #	CellFrameDashboardService/CellFrameDashboardService.pro
      #	cellframe-sdk
      #	cellframe-ui-sdk
      #	dap-ui-sdk
      #	prod_build
      #	prod_build/general/chroot_wrap.sh
      #	prod_build/general/conf/status
      #	prod_build/general/pre-build.sh
      #	prod_build/linux/debian/conf/publish
      #	prod_build/linux/debian/essentials/changelog
      #	prod_build/linux/debian/essentials/control
      #	prod_build/linux/debian/scripts/build.sh
      #	prod_build/linux/debian/scripts/chroot/post-build.sh
      #	prod_build/linux/debian/scripts/chroot/pre-build.sh
      #	prod_build/linux/debian/scripts/compile_and_pack.sh
      #	prod_build/linux/debian/scripts/deploy.sh
      #	prod_build/linux/debian/scripts/post-build.sh
      #	prod_build/linux/debian/scripts/pre-build.sh
      #	prod_build/mac/scripts/compile.sh
      #	prod_build/mac/scripts/deploy.sh
      #	prod_build/mac/scripts/pack.sh
      #	prod_build/mac/scripts/pre-build.sh
      779f5c64
    • Alexandr Mruchok's avatar
      Merge remote-tracking branch 'origin/develop' · 646b8bb9
      Alexandr Mruchok authored
      # Conflicts:
      #	.gitmodules
      #	CellFrameDashboardGUI/CellFrameDashboardGUI.pro
      #	CellFrameDashboardService/CellFrameDashboardService.pro
      #	cellframe-sdk
      #	cellframe-ui-sdk
      #	dap-ui-sdk
      #	prod_build
      #	prod_build/general/chroot_wrap.sh
      #	prod_build/general/conf/status
      #	prod_build/general/pre-build.sh
      #	prod_build/linux/debian/conf/publish
      #	prod_build/linux/debian/essentials/changelog
      #	prod_build/linux/debian/essentials/control
      #	prod_build/linux/debian/scripts/build.sh
      #	prod_build/linux/debian/scripts/chroot/post-build.sh
      #	prod_build/linux/debian/scripts/chroot/pre-build.sh
      #	prod_build/linux/debian/scripts/compile_and_pack.sh
      #	prod_build/linux/debian/scripts/deploy.sh
      #	prod_build/linux/debian/scripts/post-build.sh
      #	prod_build/linux/debian/scripts/pre-build.sh
      #	prod_build/mac/scripts/compile.sh
      #	prod_build/mac/scripts/deploy.sh
      #	prod_build/mac/scripts/pack.sh
      #	prod_build/mac/scripts/pre-build.sh
      646b8bb9
    • Alexandr Mruchok's avatar
      [*] submodules · 6784d21c
      Alexandr Mruchok authored
      6784d21c
  11. Sep 20, 2020
  12. Aug 19, 2020
  13. Jul 22, 2020
  14. Jul 14, 2020
  15. Jul 11, 2020
Loading