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

Final clean-ups required to get the engine building for OSX 64-bit #3175

Merged
merged 5 commits into from Dec 3, 2015
Merged

Final clean-ups required to get the engine building for OSX 64-bit #3175

merged 5 commits into from Dec 3, 2015

Conversation

livecodefraser
Copy link
Contributor

No description provided.

@livecodefraser livecodefraser added this to the 8.0.0-dp-9 milestone Nov 2, 2015
@peter-b
Copy link
Contributor

peter-b commented Nov 4, 2015

@livecode-vulcan review ok 2d7f176

@livecode-vulcan
Copy link
Contributor

💙 review by @peter-b ok 2d7f176

@livecode-vulcan
Copy link
Contributor

💥 merge conflict 2d7f176 → ecc2b46

@livecodefraser
Merge branch 'develop' of https://github.com/runrev/livecode into mac…
9c535b3 
…64-cleanups

Conflicts:
	engine/engine-sources.gypi
@peter-b peter-b modified the milestones: 8.0.0-dp-9, 8.0.0-dp-10 Nov 11, 2015
@peter-b
Copy link
Contributor

peter-b commented Nov 18, 2015

@livecode-vulcan review ok 9c535b3

@livecode-vulcan
Copy link
Contributor

💙 review by @peter-b ok 9c535b3

livecode-vulcan added a commit that referenced this pull request Nov 18, 2015
@livecode-vulcan
Auto-merge pull request #3175 from livecodefraser/mac64-cleanups
46e78fa 
Final clean-ups required to get the engine building for OSX 64-bit
@livecode-vulcan
Copy link
Contributor

😞 test failure 9c535b3

@peter-b peter-b modified the milestones: 8.0.0-dp-10, 8.0.0-dp-11 Nov 18, 2015
@livecodefraser
Merge branch 'develop' of https://github.com/runrev/livecode into mac…
d7c4bee 
…64-cleanups

Conflicts:
	engine/src/osxprefix.h
@peter-b
Copy link
Contributor

peter-b commented Dec 3, 2015

@livecode-vulcan review ok d7c4bee

@livecode-vulcan
Copy link
Contributor

💙 review by @peter-b ok d7c4bee

livecode-vulcan added a commit that referenced this pull request Dec 3, 2015
@livecode-vulcan
Auto-merge pull request #3175 from livecodefraser/mac64-cleanups
39d59b7 
Final clean-ups required to get the engine building for OSX 64-bit
@livecode-vulcan
Copy link
Contributor

😎 test success d7c4bee

peter-b added a commit that referenced this pull request Dec 3, 2015
@peter-b
Merge pull request #3175 from livecodefraser/mac64-cleanups
e0ab380 
[Mac64] Final clean-ups required to get the engine building for OSX 64-bit
@peter-b peter-b merged commit e0ab380 into livecode:develop Dec 3, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
vulcan/reviewed
Projects
None yet
Milestone
8.0.0-dp-11
3 participants
@livecodefraser @peter-b @livecode-vulcan