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

Commit

Permalink
Merge remote-tracking branch 'origin/develop-7.0' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	Toolset/palettes/revstandalonesettings.8.rev
	notes/bugfix-13646.md
  • Loading branch information
livecodeali committed Sep 24, 2015
2 parents 811eec4 + 1e5b42d commit 9a803dd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Engine License.txt
Expand Up @@ -2,7 +2,7 @@ This license applies to all the executable files that make up LiveCode.

The source code for both the IDE and engine components can be found at:

https://github.com/runrev/livecode
https://github.com/livecode/livecode

----------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion IDE License.txt
Expand Up @@ -6,7 +6,7 @@ in the Commercial Edition of LiveCode.

The source code for both the IDE and engine components can be found at:

https://github.com/runrev/livecode
https://github.com/livecode/livecode

----------------------------------------------------------------------

Expand Down

0 comments on commit 9a803dd

Please sign in to comment.