Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit b411df4

Browse files
author
livecodeali
committed
Merge remote-tracking branch 'upstream/develop-7.0' into develop
Conflicts: builder/markdown_compiler.rev builder/release_notes_builder.livecodescript docs/dictionary/command/export-with-palette.xml docs/dictionary/function/specialFolderPath.xml docs/dictionary/keyword/dateItems.xml engine/Android.mk engine/Makefile.kernel engine/Makefile.kernel-server engine/engine-mobile.xcodeproj/project.pbxproj engine/engine.xcodeproj/project.pbxproj engine/kernel.vcproj engine/src/capsule.h engine/src/card.cpp engine/src/chunk.cpp engine/src/customprinter.cpp engine/src/deploy.cpp engine/src/exec-interface-player.cpp engine/src/exec-interface.cpp engine/src/executionerrors.h engine/src/externalv0.cpp engine/src/externalv1.cpp engine/src/image_rep.cpp engine/src/image_rep.h engine/src/mblandroiddc.cpp engine/src/util.cpp ide libexternal/src/external.c libfoundation/include/foundation-auto.h libfoundation/include/foundation.h libfoundation/src/foundation-string.cpp libgraphics/src/lnxtext.cpp thirdparty util/build_libinfo.pl version
2 parents b08c4c2 + 36c3889 commit b411df4

File tree

262 files changed

+7787
-1145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

262 files changed

+7787
-1145
lines changed

Livecode.files

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ engine/src/contextscalewrapper.cpp
104104
engine/src/contextscalewrapper.h
105105
engine/src/control.cpp
106106
engine/src/control.h
107+
engine/src/coretextfonts.cpp
107108
engine/src/cpalette.cpp
108109
engine/src/cpalette.h
109110
engine/src/customprinter.cpp
@@ -789,6 +790,14 @@ ide/Engine License.txt
789790
ide/IDE License.txt
790791
ide/License Agreement.txt
791792
ide/Open Source Licenses.txt
793+
ide-support/revdeploylibraryandroid.livecodescript
794+
ide-support/revdocsparser.livecodescript
795+
ide-support/revsaveasandroidstandalone.livecodescript
796+
ide-support/revsaveasstandalone.livecodescript
797+
ide-support/revdeploylibraryios.livecodescript
798+
ide-support/revliburl.livecodescript
799+
ide-support/revsaveasiosstandalone.livecodescript
800+
ide-support/revsblibrary.livecodescript
792801
lcidlc/src/Error.cpp
793802
lcidlc/src/Error.h
794803
lcidlc/src/Interface.cpp
@@ -3444,8 +3453,11 @@ thirdparty/libzip/src/zipint.h
34443453
thirdparty/libzip/src/zipintw32.h
34453454
thirdparty/libzip/score.txt
34463455
thirdparty/tools/perfect.c
3456+
tools/build-android.osx
3457+
tools/build-ios.osx
34473458
tools/build-extension-ios.sh
34483459
score.txt
3460+
version
34493461
Makefile
34503462
engine/Makefile.standalone
34513463
engine/Makefile.server

builder/builder.rev

-22.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)