Commit f88f3f1
runrevali
Merge branch 'develop' of https://github.com/runrev/livecode into refactor-syntax_unicode_6.6_merge
Conflicts:
Makefile
engine/Android.mk
engine/engine-mobile.xcodeproj/project.pbxproj
engine/engine.vcproj
engine/engine.xcodeproj/project.pbxproj
engine/hash_strings.rev
engine/src/cmds.cpp
engine/src/cmdsf.cpp
engine/src/debug.cpp
engine/src/debug.h
engine/src/deploy_sign.cpp
engine/src/globals.cpp
engine/src/handler.cpp
engine/src/keywords.cpp
engine/src/lnxdc.cpp
engine/src/lnxdc.h
engine/src/lnxdcs.cpp
engine/src/mblandroiddc.cpp
engine/src/mbldc.h
engine/src/mbliphonedc.mm
engine/src/mblmain.cpp
engine/src/mcssl.cpp
engine/src/mcssl.h
engine/src/mode_development.cpp
engine/src/opensslsocket.cpp
engine/src/operator.cpp
engine/src/osxdc.h
engine/src/osxsnapshot.mm
engine/src/parseerrors.h
engine/src/property.cpp
engine/src/socket.h
engine/src/srvscript.cpp
engine/src/statemnt.cpp
engine/src/sysdefs.h
engine/src/sysspec.cpp
engine/src/uidc.cpp
engine/src/uidc.h
engine/src/util.cpp
engine/src/w32dc.h
engine/src/w32dcs.cpp
engine/src/w32stack.cpp
engine/src/w32theme.cpp
ide
libgraphics/src/mblandroidtext.cpp
prebuilt
rules/Global Mobile.xcconfig
rules/Global.vsprops
rules/Global.xcconfig
rules/application.linux.makefile
rules/common.linux.makefile
rules/library.linux.makefile
thirdparty
versionFile tree
202 files changed
+5548
-2205
lines changed- docs
- dictionary
- command
- function
- property
- notes
- engine
- engine-mobile.xcodeproj
- engine.xcodeproj
- rsrc
- src
- java/com/runrev/android/nativecontrol
- libcore
- include
- libcore-mobile.xcodeproj
- src
- libfoundation/include
- libgraphics
- include
- libgraphics-mobile.xcodeproj
- src
- revdb/src
- rules
- tools
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
202 files changed
+5548
-2205
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
| 73 | + | |
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
| 1 | + | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| |||
0 commit comments