{"action":"closed","number":244,"pull_request":{"url":"https://api.github.com/repos/TiVo/intellij-haxe/pulls/244","id":33613243,"html_url":"https://github.com/TiVo/intellij-haxe/pull/244","diff_url":"https://github.com/TiVo/intellij-haxe/pull/244.diff","patch_url":"https://github.com/TiVo/intellij-haxe/pull/244.patch","issue_url":"https://api.github.com/repos/TiVo/intellij-haxe/issues/244","number":244,"state":"closed","locked":false,"title":"Merge back changes from masterIdea14","user":{"login":"EBatTiVo","id":7231977,"avatar_url":"https://avatars.githubusercontent.com/u/7231977?v=3","gravatar_id":"","url":"https://api.github.com/users/EBatTiVo","html_url":"https://github.com/EBatTiVo","followers_url":"https://api.github.com/users/EBatTiVo/followers","following_url":"https://api.github.com/users/EBatTiVo/following{/other_user}","gists_url":"https://api.github.com/users/EBatTiVo/gists{/gist_id}","starred_url":"https://api.github.com/users/EBatTiVo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/EBatTiVo/subscriptions","organizations_url":"https://api.github.com/users/EBatTiVo/orgs","repos_url":"https://api.github.com/users/EBatTiVo/repos","events_url":"https://api.github.com/users/EBatTiVo/events{/privacy}","received_events_url":"https://api.github.com/users/EBatTiVo/received_events","type":"User","site_admin":false},"body":"This change brings the outstanding changes that were checked into the masterIdea14 branch back down to the src/14 directories on the master branch.  When this is submitted, we can remove masterIdea14.\r\n\r\nAll of the changes were merged down to masterIdea14 before this branch was made.  Really, we are simply moving three files from common to src/13, then adding the v14 versions of those same files from masterIdea14 into the src/14 and src/14.1 directories.  giabao's changes are already in master so they don't appear on in the changed file list.  (I tried to find a way to keep the history -- even by moving through multiple branches, -- but git doesn't provide a way for a single file to have multiple, divergent, paths in the same tree; one file can't have two or more descendants.)","created_at":"2015-04-19T04:09:00Z","updated_at":"2015-04-20T22:41:55Z","closed_at":"2015-04-20T22:41:55Z","merged_at":"2015-04-20T22:41:55Z","merge_commit_sha":"be1954c8f05111be39807991ca4a3272b1f29b4d","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/TiVo/intellij-haxe/pulls/244/commits","review_comments_url":"https://api.github.com/repos/TiVo/intellij-haxe/pulls/244/comments","review_comment_url":"https://api.github.com/repos/TiVo/intellij-haxe/pulls/comments{/number}","comments_url":"https://api.github.com/repos/TiVo/intellij-haxe/issues/244/comments","statuses_url":"https://api.github.com/repos/TiVo/intellij-haxe/statuses/1a78a2f0e8c6954c9d67f20a6dbff84b0276c701","head":{"label":"TiVo:MergeBackFromMasterIdea14","ref":"MergeBackFromMasterIdea14","sha":"1a78a2f0e8c6954c9d67f20a6dbff84b0276c701","user":{"login":"TiVo","id":4993382,"avatar_url":"https://avatars.githubusercontent.com/u/4993382?v=3","gravatar_id":"","url":"https://api.github.com/users/TiVo","html_url":"https://github.com/TiVo","followers_url":"https://api.github.com/users/TiVo/followers","following_url":"https://api.github.com/users/TiVo/following{/other_user}","gists_url":"https://api.github.com/users/TiVo/gists{/gist_id}","starred_url":"https://api.github.com/users/TiVo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/TiVo/subscriptions","organizations_url":"https://api.github.com/users/TiVo/orgs","repos_url":"https://api.github.com/users/TiVo/repos","events_url":"https://api.github.com/users/TiVo/events{/privacy}","received_events_url":"https://api.github.com/users/TiVo/received_events","type":"Organization","site_admin":false},"repo":{"id":16564608,"name":"intellij-haxe","full_name":"TiVo/intellij-haxe","owner":{"login":"TiVo","id":4993382,"avatar_url":"https://avatars.githubusercontent.com/u/4993382?v=3","gravatar_id":"","url":"https://api.github.com/users/TiVo","html_url":"https://github.com/TiVo","followers_url":"https://api.github.com/users/TiVo/followers","following_url":"https://api.github.com/users/TiVo/following{/other_user}","gists_url":"https://api.github.com/users/TiVo/gists{/gist_id}","starred_url":"https://api.github.com/users/TiVo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/TiVo/subscriptions","organizations_url":"https://api.github.com/users/TiVo/orgs","repos_url":"https://api.github.com/users/TiVo/repos","events_url":"https://api.github.com/users/TiVo/events{/privacy}","received_events_url":"https://api.github.com/users/TiVo/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/TiVo/intellij-haxe","description":"Haxe plugin for IntelliJ Platform based IDEs","fork":true,"url":"https://api.github.com/repos/TiVo/intellij-haxe","forks_url":"https://api.github.com/repos/TiVo/intellij-haxe/forks","keys_url":"https://api.github.com/repos/TiVo/intellij-haxe/keys{/key_id}","collaborators_url":"https://api.github.com/repos/TiVo/intellij-haxe/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/TiVo/intellij-haxe/teams","hooks_url":"https://api.github.com/repos/TiVo/intellij-haxe/hooks","issue_events_url":"https://api.github.com/repos/TiVo/intellij-haxe/issues/events{/number}","events_url":"https://api.github.com/repos/TiVo/intellij-haxe/events","assignees_url":"https://api.github.com/repos/TiVo/intellij-haxe/assignees{/user}","branches_url":"https://api.github.com/repos/TiVo/intellij-haxe/branches{/branch}","tags_url":"https://api.github.com/repos/TiVo/intellij-haxe/tags","blobs_url":"https://api.github.com/repos/TiVo/intellij-haxe/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/TiVo/intellij-haxe/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/TiVo/intellij-haxe/git/refs{/sha}","trees_url":"https://api.github.com/repos/TiVo/intellij-haxe/git/trees{/sha}","statuses_url":"https://api.github.com/repos/TiVo/intellij-haxe/statuses/{sha}","languages_url":"https://api.github.com/repos/TiVo/intellij-haxe/languages","stargazers_url":"https://api.github.com/repos/TiVo/intellij-haxe/stargazers","contributors_url":"https://api.github.com/repos/TiVo/intellij-haxe/contributors","subscribers_url":"https://api.github.com/repos/TiVo/intellij-haxe/subscribers","subscription_url":"https://api.github.com/repos/TiVo/intellij-haxe/subscription","commits_url":"https://api.github.com/repos/TiVo/intellij-haxe/commits{/sha}","git_commits_url":"https://api.github.com/repos/TiVo/intellij-haxe/git/commits{/sha}","comments_url":"https://api.github.com/repos/TiVo/intellij-haxe/comments{/number}","issue_comment_url":"https://api.github.com/repos/TiVo/intellij-haxe/issues/comments{/number}","contents_url":"https://api.github.com/repos/TiVo/intellij-haxe/contents/{+path}","compare_url":"https://api.github.com/repos/TiVo/intellij-haxe/compare/{base}...{head}","merges_url":"https://api.github.com/repos/TiVo/intellij-haxe/merges","archive_url":"https://api.github.com/repos/TiVo/intellij-haxe/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/TiVo/intellij-haxe/downloads","issues_url":"https://api.github.com/repos/TiVo/intellij-haxe/issues{/number}","pulls_url":"https://api.github.com/repos/TiVo/intellij-haxe/pulls{/number}","milestones_url":"https://api.github.com/repos/TiVo/intellij-haxe/milestones{/number}","notifications_url":"https://api.github.com/repos/TiVo/intellij-haxe/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/TiVo/intellij-haxe/labels{/name}","releases_url":"https://api.github.com/repos/TiVo/intellij-haxe/releases{/id}","created_at":"2014-02-06T01:06:24Z","updated_at":"2015-04-20T22:38:39Z","pushed_at":"2015-04-20T22:41:55Z","git_url":"git://github.com/TiVo/intellij-haxe.git","ssh_url":"git@github.com:TiVo/intellij-haxe.git","clone_url":"https://github.com/TiVo/intellij-haxe.git","svn_url":"https://github.com/TiVo/intellij-haxe","homepage":null,"size":29485,"stargazers_count":45,"watchers_count":45,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":5,"mirror_url":null,"open_issues_count":116,"forks":5,"open_issues":116,"watchers":45,"default_branch":"master"}},"base":{"label":"TiVo:master","ref":"master","sha":"393aced471b710f0a0d4c08cf04cf1b82e43a0fa","user":{"login":"TiVo","id":4993382,"avatar_url":"https://avatars.githubusercontent.com/u/4993382?v=3","gravatar_id":"","url":"https://api.github.com/users/TiVo","html_url":"https://github.com/TiVo","followers_url":"https://api.github.com/users/TiVo/followers","following_url":"https://api.github.com/users/TiVo/following{/other_user}","gists_url":"https://api.github.com/users/TiVo/gists{/gist_id}","starred_url":"https://api.github.com/users/TiVo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/TiVo/subscriptions","organizations_url":"https://api.github.com/users/TiVo/orgs","repos_url":"https://api.github.com/users/TiVo/repos","events_url":"https://api.github.com/users/TiVo/events{/privacy}","received_events_url":"https://api.github.com/users/TiVo/received_events","type":"Organization","site_admin":false},"repo":{"id":16564608,"name":"intellij-haxe","full_name":"TiVo/intellij-haxe","owner":{"login":"TiVo","id":4993382,"avatar_url":"https://avatars.githubusercontent.com/u/4993382?v=3","gravatar_id":"","url":"https://api.github.com/users/TiVo","html_url":"https://github.com/TiVo","followers_url":"https://api.github.com/users/TiVo/followers","following_url":"https://api.github.com/users/TiVo/following{/other_user}","gists_url":"https://api.github.com/users/TiVo/gists{/gist_id}","starred_url":"https://api.github.com/users/TiVo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/TiVo/subscriptions","organizations_url":"https://api.github.com/users/TiVo/orgs","repos_url":"https://api.github.com/users/TiVo/repos","events_url":"https://api.github.com/users/TiVo/events{/privacy}","received_events_url":"https://api.github.com/users/TiVo/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/TiVo/intellij-haxe","description":"Haxe plugin for IntelliJ Platform based IDEs","fork":true,"url":"https://api.github.com/repos/TiVo/intellij-haxe","forks_url":"https://api.github.com/repos/TiVo/intellij-haxe/forks","keys_url":"https://api.github.com/repos/TiVo/intellij-haxe/keys{/key_id}","collaborators_url":"https://api.github.com/repos/TiVo/intellij-haxe/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/TiVo/intellij-haxe/teams","hooks_url":"https://api.github.com/repos/TiVo/intellij-haxe/hooks","issue_events_url":"https://api.github.com/repos/TiVo/intellij-haxe/issues/events{/number}","events_url":"https://api.github.com/repos/TiVo/intellij-haxe/events","assignees_url":"https://api.github.com/repos/TiVo/intellij-haxe/assignees{/user}","branches_url":"https://api.github.com/repos/TiVo/intellij-haxe/branches{/branch}","tags_url":"https://api.github.com/repos/TiVo/intellij-haxe/tags","blobs_url":"https://api.github.com/repos/TiVo/intellij-haxe/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/TiVo/intellij-haxe/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/TiVo/intellij-haxe/git/refs{/sha}","trees_url":"https://api.github.com/repos/TiVo/intellij-haxe/git/trees{/sha}","statuses_url":"https://api.github.com/repos/TiVo/intellij-haxe/statuses/{sha}","languages_url":"https://api.github.com/repos/TiVo/intellij-haxe/languages","stargazers_url":"https://api.github.com/repos/TiVo/intellij-haxe/stargazers","contributors_url":"https://api.github.com/repos/TiVo/intellij-haxe/contributors","subscribers_url":"https://api.github.com/repos/TiVo/intellij-haxe/subscribers","subscription_url":"https://api.github.com/repos/TiVo/intellij-haxe/subscription","commits_url":"https://api.github.com/repos/TiVo/intellij-haxe/commits{/sha}","git_commits_url":"https://api.github.com/repos/TiVo/intellij-haxe/git/commits{/sha}","comments_url":"https://api.github.com/repos/TiVo/intellij-haxe/comments{/number}","issue_comment_url":"https://api.github.com/repos/TiVo/intellij-haxe/issues/comments{/number}","contents_url":"https://api.github.com/repos/TiVo/intellij-haxe/contents/{+path}","compare_url":"https://api.github.com/repos/TiVo/intellij-haxe/compare/{base}...{head}","merges_url":"https://api.github.com/repos/TiVo/intellij-haxe/merges","archive_url":"https://api.github.com/repos/TiVo/intellij-haxe/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/TiVo/intellij-haxe/downloads","issues_url":"https://api.github.com/repos/TiVo/intellij-haxe/issues{/number}","pulls_url":"https://api.github.com/repos/TiVo/intellij-haxe/pulls{/number}","milestones_url":"https://api.github.com/repos/TiVo/intellij-haxe/milestones{/number}","notifications_url":"https://api.github.com/repos/TiVo/intellij-haxe/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/TiVo/intellij-haxe/labels{/name}","releases_url":"https://api.github.com/repos/TiVo/intellij-haxe/releases{/id}","created_at":"2014-02-06T01:06:24Z","updated_at":"2015-04-20T22:38:39Z","pushed_at":"2015-04-20T22:41:55Z","git_url":"git://github.com/TiVo/intellij-haxe.git","ssh_url":"git@github.com:TiVo/intellij-haxe.git","clone_url":"https://github.com/TiVo/intellij-haxe.git","svn_url":"https://github.com/TiVo/intellij-haxe","homepage":null,"size":29485,"stargazers_count":45,"watchers_count":45,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":5,"mirror_url":null,"open_issues_count":116,"forks":5,"open_issues":116,"watchers":45,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/TiVo/intellij-haxe/pulls/244"},"html":{"href":"https://github.com/TiVo/intellij-haxe/pull/244"},"issue":{"href":"https://api.github.com/repos/TiVo/intellij-haxe/issues/244"},"comments":{"href":"https://api.github.com/repos/TiVo/intellij-haxe/issues/244/comments"},"review_comments":{"href":"https://api.github.com/repos/TiVo/intellij-haxe/pulls/244/comments"},"review_comment":{"href":"https://api.github.com/repos/TiVo/intellij-haxe/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/TiVo/intellij-haxe/pulls/244/commits"},"statuses":{"href":"https://api.github.com/repos/TiVo/intellij-haxe/statuses/1a78a2f0e8c6954c9d67f20a6dbff84b0276c701"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"EBatTiVo","id":7231977,"avatar_url":"https://avatars.githubusercontent.com/u/7231977?v=3","gravatar_id":"","url":"https://api.github.com/users/EBatTiVo","html_url":"https://github.com/EBatTiVo","followers_url":"https://api.github.com/users/EBatTiVo/followers","following_url":"https://api.github.com/users/EBatTiVo/following{/other_user}","gists_url":"https://api.github.com/users/EBatTiVo/gists{/gist_id}","starred_url":"https://api.github.com/users/EBatTiVo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/EBatTiVo/subscriptions","organizations_url":"https://api.github.com/users/EBatTiVo/orgs","repos_url":"https://api.github.com/users/EBatTiVo/repos","events_url":"https://api.github.com/users/EBatTiVo/events{/privacy}","received_events_url":"https://api.github.com/users/EBatTiVo/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"commits":22,"additions":2882,"deletions":0,"changed_files":9}}