Skip to content

Commit 3a904db

Browse files
livecodesebastienlivecodesebastien
committed
Merge remote-tracking branch 'origin/develop-6.7' into develop-7.0
Conflicts: 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/desktop.cpp engine/src/field.cpp engine/src/globals.cpp engine/src/globals.h engine/src/graphic.cpp engine/src/lnxflst.cpp engine/src/lnxgtktheme.cpp engine/src/object.h engine/src/player-platform.cpp engine/src/player-platform.h engine/src/stack.h engine/src/sysdefs.h engine/src/util.cpp ide ide-support/revsaveasiosstandalone.livecodescript libgraphics/src/lnxtext.cpp
2 parents 4fb9916 + 41fc67b commit 3a904db

Some content is hidden

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

61 files changed

+2360
-760
lines changed

‎docs/notes/bugfix-14349.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Can't use mouse events in QT players on a Mac

‎docs/notes/bugfix-14435.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Problems with players, relative file paths and the defaultFolder

‎docs/notes/bugfix-14684.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# 2.2 Android Froyo standalone application crashes

‎docs/notes/bugfix-15292.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Minimum Android Version - add 4.0

‎docs/notes/bugfix-15324.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# in iOS, RGB values of exported images printed to PDF are reversed

‎docs/notes/bugfix-15372.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Wait with messages causes crash on Mac OS

‎docs/notes/bugfix-15385.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# keyUp on MacOS is sent with wrong value, after a failed dead char combination

‎docs/notes/bugfix-15401.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# the defaultFolder is initialised to the iOS SDK path

‎docs/notes/bugfix-15408.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Deleted objects can still be accessed in some circumstances.

‎engine/Android.mk‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ LOCAL_SRC_FILES := $(addprefix src/,\
8383
exec-interface-object.cpp exec-interface-player.cpp exec-interface-scrollbar.cpp exec-interface-stack.cpp \
8484
exec-interface-vclip.cpp exec-legacy.cpp exec-dialog.cpp exec-keywords.cpp \
8585
syntax.cpp \
86-
foundation-legacy.cpp legacy_spec.cpp \
87-
stacktile.cpp sysunxthreads.cpp)
86+
foundation-legacy.cpp legacy_spec.cpp )
8887

8988
LOCAL_C_INCLUDES := \
9089
$(LOCAL_PATH)/include \

0 commit comments

Comments
 (0)