Commit 93c219a
committed
Merge branch 'develop-7.0' of https://github.com/runrev/livecode into develop-7.0-gyp
Conflicts:
engine/Android.mk
engine/engine-mobile.xcodeproj/project.pbxproj
engine/engine.xcodeproj/project.pbxproj
engine/kernel-server.vcproj
engine/kernel.vcproj
engine/src/desktop.cpp
engine/src/player-platform.cpp
engine/src/player-platform.h
engine/src/stack.cpp
engine/src/stack.h
ide
ide-support/revsaveasiosstandalone.livecodescript
util/build_libinfo.plFile tree
112 files changed
+1353
-979
lines changed- docs/notes
- engine
- include
- src
- ide-support
- libfoundation
- include
- src
- libgraphics/src
- revdb/src
- revzip/src
- tools
- util
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
112 files changed
+1353
-979
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
0 commit comments