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

Commit 63e91bc

Browse files
livecodeianlivecodeian
committed
Merge branch 'develop' of https://github.com/livecode/livecode into feature-browser_widget_callbacks
2 parents 09dd1f2 + d6c9584 commit 63e91bc

File tree

1,099 files changed

+3640
-2103
lines changed

Some content is hidden

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

1,099 files changed

+3640
-2103
lines changed

HACKING.md renamed to CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ If you wish to contribute to development of LiveCode, you must sign the [Contrib
1616

1717
## Using GitHub
1818

19-
The LiveCode workflow is a typical git workflow, where contributors fork the [runrev/livecode](https://github.com/runrev/livecode) repository, make their changes on a branch, and then submit a pull request.
19+
The LiveCode workflow is a typical git workflow, where contributors fork the [livecode/livecode](https://github.com/livecode/livecode) repository, make their changes on a branch, and then submit a pull request.
2020

2121
### Setting up git with your user information
2222

‎INSTALL-linux.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ The following additional packages are installed:
7373
* liblcms-dev
7474
* pkg-config
7575
* libgtk2.0-dev
76+
* zip
7677

7778
### Linux x86
7879

@@ -108,6 +109,7 @@ The following additional packages are installed:
108109
* libesd0-dev
109110
* liblcms-dev
110111
* pkgconfig
112+
* zip
111113

112114
In addition, LiveCode requires a more modern version of GTK+ than is available in the Debian Squeeze repositories. The following packages are compiled and installed from source:
113115

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Notes:
22

33
The majority of the code in the LiveCode Community edition is copyrighted
4-
by Runtime Revolution Ltd and has been released under the GPLv3.
4+
by LiveCode Ltd and has been released under the GPLv3.
55

66
However, the revBrowser component on Windows and secure sockets and
77
encryption feature on Windows and Linux utilises code that is under a
88
license incompatible with the GPL. Specifically revBrowser uses ATL and
99
the secure sockets and encryption feature uses OpenSSL.
1010

1111
To this end, as a special exception to the terms and conditions of the
12-
GPL listed below, Runtime Revolution Ltd gives you explicit permission to
12+
GPL listed below, LiveCode Ltd gives you explicit permission to
1313
combine its GPL code contained in LiveCode Community with ATL and
1414
OpenSSL. You may copy and distribute such a combination provided that
1515
you adhere to the terms and conditions of all of the GPL and licenses

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2015 Runtime Revolution Ltd.
1+
# Copyright (C) 2015 LiveCode Ltd.
22
#
33
# This file is part of LiveCode.
44
#
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 8.2 8.4
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4
28+
IPHONEOS_VERSIONS ?= 8.2 8.4 9.0
29+
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4 9.0
3030

3131
IOS_SDKS ?= \
3232
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ There are several ways to get help with installing and using LiveCode:
9292

9393
## Contributing to LiveCode
9494

95-
For information on modifying LiveCode and submitting contributions to the LiveCode Community project, please see the [HACKING](HACKING.md) file.
95+
For information on modifying LiveCode and submitting contributions to the LiveCode Community project, please see the [CONTRIBUTING](CONTRIBUTING.md) file.
9696

9797
## License
9898

‎buildbot.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2015 Runtime Revolution Ltd.
1+
# Copyright (C) 2015 LiveCode Ltd.
22
#
33
# This file is part of LiveCode.
44
#

‎builder/installer_utilities.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "InstallerUtilities"
22
# This is the back-end installer, updater and uninstaller code.
33
# This code doesn't know anything about the product it is installing, and should be capable
4-
# of being re-used for products other than Revolution. It reads a "manifest" file, which contains
4+
# of being re-used for products other than LiveCode. It reads a "manifest" file, which contains
55
# a list of files to be installed and some metadata. The files are then installed according to command
66
# line options. Uninstallation uses a "record" file, which is created by the installer. This is basically the same
77
# as the manifest file, but with a little less information.

‎builder/mac_info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>
16-
<string>runrevinstaller</string>
16+
<string>livecodeinstaller</string>
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleSignature</key>
@@ -27,7 +27,7 @@
2727
<key>NSAppleScriptEnabled</key>
2828
<string>YES</string>
2929
<key>NSHumanReadableCopyright</key>
30-
<string>Copyright 2000-2014, Runtime Revolution Ltd., All Rights Reserved.</string>
30+
<string>Copyright 2000-2015, LiveCode Ltd., All Rights Reserved.</string>
3131
<key>NSHighResolutionCapable</key>
3232
<true/>
3333
<key>LSBackgroundOnly</key>

‎builder/markdown_compiler.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "MarkdownCompiler"
22
/*
33
4-
Compiles RunRev flavoured markdown files to HTML
4+
Compiles LiveCode flavoured markdown files to HTML
55
66
MD:
77
##... <headings>

‎builder/package_compiler.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ private command compilerExecuteShortcut @self, pCommand
10331033
exit repeat
10341034
end if
10351035

1036-
-- See if the target matches a folder prefix (e.g. .../Revolution.app)
1036+
-- See if the target matches a folder prefix (e.g. .../LiveCode.app)
10371037
if item 2 of tLine begins with (tTarget & slash) then
10381038
put true into tFound
10391039
exit repeat

0 commit comments

Comments
 (0)