{"action":"closed","number":525,"pull_request":{"url":"https://api.github.com/repos/project64/project64/pulls/525","id":38391106,"html_url":"https://github.com/project64/project64/pull/525","diff_url":"https://github.com/project64/project64/pull/525.diff","patch_url":"https://github.com/project64/project64/pull/525.patch","issue_url":"https://api.github.com/repos/project64/project64/issues/525","number":525,"state":"closed","locked":false,"title":"newline fixes -- These were my (or Notepad++'s?) fault somehow.","user":{"login":"cxd4","id":1396303,"avatar_url":"https://avatars.githubusercontent.com/u/1396303?v=3","gravatar_id":"","url":"https://api.github.com/users/cxd4","html_url":"https://github.com/cxd4","followers_url":"https://api.github.com/users/cxd4/followers","following_url":"https://api.github.com/users/cxd4/following{/other_user}","gists_url":"https://api.github.com/users/cxd4/gists{/gist_id}","starred_url":"https://api.github.com/users/cxd4/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cxd4/subscriptions","organizations_url":"https://api.github.com/users/cxd4/orgs","repos_url":"https://api.github.com/users/cxd4/repos","events_url":"https://api.github.com/users/cxd4/events{/privacy}","received_events_url":"https://api.github.com/users/cxd4/received_events","type":"User","site_admin":false},"body":"Well, I don't know how it happened, but VS2013 complained on loading up the file that the newlines were inconsistent (mixed CRLF with LF).  Somehow resolving merge conflicts using Git with Notepad++ on Windows must have messed with the line breaks, and VS2013 automatically wrote the corrections to my master branch so I didn't have time to make a new branch first.","created_at":"2015-06-23T22:42:03Z","updated_at":"2015-06-23T23:37:32Z","closed_at":"2015-06-23T23:37:32Z","merged_at":"2015-06-23T23:37:32Z","merge_commit_sha":"bbe1fdea0918ca16c33854c85557e065306aada7","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/project64/project64/pulls/525/commits","review_comments_url":"https://api.github.com/repos/project64/project64/pulls/525/comments","review_comment_url":"https://api.github.com/repos/project64/project64/pulls/comments{/number}","comments_url":"https://api.github.com/repos/project64/project64/issues/525/comments","statuses_url":"https://api.github.com/repos/project64/project64/statuses/5ad04ed06762d76351dea8ad916d81724ea6beb7","head":{"label":"cxd4:master","ref":"master","sha":"5ad04ed06762d76351dea8ad916d81724ea6beb7","user":{"login":"cxd4","id":1396303,"avatar_url":"https://avatars.githubusercontent.com/u/1396303?v=3","gravatar_id":"","url":"https://api.github.com/users/cxd4","html_url":"https://github.com/cxd4","followers_url":"https://api.github.com/users/cxd4/followers","following_url":"https://api.github.com/users/cxd4/following{/other_user}","gists_url":"https://api.github.com/users/cxd4/gists{/gist_id}","starred_url":"https://api.github.com/users/cxd4/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cxd4/subscriptions","organizations_url":"https://api.github.com/users/cxd4/orgs","repos_url":"https://api.github.com/users/cxd4/repos","events_url":"https://api.github.com/users/cxd4/events{/privacy}","received_events_url":"https://api.github.com/users/cxd4/received_events","type":"User","site_admin":false},"repo":{"id":37690988,"name":"project64","full_name":"cxd4/project64","owner":{"login":"cxd4","id":1396303,"avatar_url":"https://avatars.githubusercontent.com/u/1396303?v=3","gravatar_id":"","url":"https://api.github.com/users/cxd4","html_url":"https://github.com/cxd4","followers_url":"https://api.github.com/users/cxd4/followers","following_url":"https://api.github.com/users/cxd4/following{/other_user}","gists_url":"https://api.github.com/users/cxd4/gists{/gist_id}","starred_url":"https://api.github.com/users/cxd4/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cxd4/subscriptions","organizations_url":"https://api.github.com/users/cxd4/orgs","repos_url":"https://api.github.com/users/cxd4/repos","events_url":"https://api.github.com/users/cxd4/events{/privacy}","received_events_url":"https://api.github.com/users/cxd4/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/cxd4/project64","description":"N64 Emulator","fork":true,"url":"https://api.github.com/repos/cxd4/project64","forks_url":"https://api.github.com/repos/cxd4/project64/forks","keys_url":"https://api.github.com/repos/cxd4/project64/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cxd4/project64/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cxd4/project64/teams","hooks_url":"https://api.github.com/repos/cxd4/project64/hooks","issue_events_url":"https://api.github.com/repos/cxd4/project64/issues/events{/number}","events_url":"https://api.github.com/repos/cxd4/project64/events","assignees_url":"https://api.github.com/repos/cxd4/project64/assignees{/user}","branches_url":"https://api.github.com/repos/cxd4/project64/branches{/branch}","tags_url":"https://api.github.com/repos/cxd4/project64/tags","blobs_url":"https://api.github.com/repos/cxd4/project64/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cxd4/project64/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cxd4/project64/git/refs{/sha}","trees_url":"https://api.github.com/repos/cxd4/project64/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cxd4/project64/statuses/{sha}","languages_url":"https://api.github.com/repos/cxd4/project64/languages","stargazers_url":"https://api.github.com/repos/cxd4/project64/stargazers","contributors_url":"https://api.github.com/repos/cxd4/project64/contributors","subscribers_url":"https://api.github.com/repos/cxd4/project64/subscribers","subscription_url":"https://api.github.com/repos/cxd4/project64/subscription","commits_url":"https://api.github.com/repos/cxd4/project64/commits{/sha}","git_commits_url":"https://api.github.com/repos/cxd4/project64/git/commits{/sha}","comments_url":"https://api.github.com/repos/cxd4/project64/comments{/number}","issue_comment_url":"https://api.github.com/repos/cxd4/project64/issues/comments{/number}","contents_url":"https://api.github.com/repos/cxd4/project64/contents/{+path}","compare_url":"https://api.github.com/repos/cxd4/project64/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cxd4/project64/merges","archive_url":"https://api.github.com/repos/cxd4/project64/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cxd4/project64/downloads","issues_url":"https://api.github.com/repos/cxd4/project64/issues{/number}","pulls_url":"https://api.github.com/repos/cxd4/project64/pulls{/number}","milestones_url":"https://api.github.com/repos/cxd4/project64/milestones{/number}","notifications_url":"https://api.github.com/repos/cxd4/project64/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cxd4/project64/labels{/name}","releases_url":"https://api.github.com/repos/cxd4/project64/releases{/id}","created_at":"2015-06-18T23:30:47Z","updated_at":"2015-06-18T23:30:56Z","pushed_at":"2015-06-23T22:40:16Z","git_url":"git://github.com/cxd4/project64.git","ssh_url":"git@github.com:cxd4/project64.git","clone_url":"https://github.com/cxd4/project64.git","svn_url":"https://github.com/cxd4/project64","homepage":"http://www.pj64-emu.com/","size":35792,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"project64:master","ref":"master","sha":"16f4780f9ad568249f77fa1fe049e96a116adf7a","user":{"login":"project64","id":4994272,"avatar_url":"https://avatars.githubusercontent.com/u/4994272?v=3","gravatar_id":"","url":"https://api.github.com/users/project64","html_url":"https://github.com/project64","followers_url":"https://api.github.com/users/project64/followers","following_url":"https://api.github.com/users/project64/following{/other_user}","gists_url":"https://api.github.com/users/project64/gists{/gist_id}","starred_url":"https://api.github.com/users/project64/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/project64/subscriptions","organizations_url":"https://api.github.com/users/project64/orgs","repos_url":"https://api.github.com/users/project64/repos","events_url":"https://api.github.com/users/project64/events{/privacy}","received_events_url":"https://api.github.com/users/project64/received_events","type":"User","site_admin":false},"repo":{"id":26941088,"name":"project64","full_name":"project64/project64","owner":{"login":"project64","id":4994272,"avatar_url":"https://avatars.githubusercontent.com/u/4994272?v=3","gravatar_id":"","url":"https://api.github.com/users/project64","html_url":"https://github.com/project64","followers_url":"https://api.github.com/users/project64/followers","following_url":"https://api.github.com/users/project64/following{/other_user}","gists_url":"https://api.github.com/users/project64/gists{/gist_id}","starred_url":"https://api.github.com/users/project64/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/project64/subscriptions","organizations_url":"https://api.github.com/users/project64/orgs","repos_url":"https://api.github.com/users/project64/repos","events_url":"https://api.github.com/users/project64/events{/privacy}","received_events_url":"https://api.github.com/users/project64/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/project64/project64","description":"N64 Emulator","fork":false,"url":"https://api.github.com/repos/project64/project64","forks_url":"https://api.github.com/repos/project64/project64/forks","keys_url":"https://api.github.com/repos/project64/project64/keys{/key_id}","collaborators_url":"https://api.github.com/repos/project64/project64/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/project64/project64/teams","hooks_url":"https://api.github.com/repos/project64/project64/hooks","issue_events_url":"https://api.github.com/repos/project64/project64/issues/events{/number}","events_url":"https://api.github.com/repos/project64/project64/events","assignees_url":"https://api.github.com/repos/project64/project64/assignees{/user}","branches_url":"https://api.github.com/repos/project64/project64/branches{/branch}","tags_url":"https://api.github.com/repos/project64/project64/tags","blobs_url":"https://api.github.com/repos/project64/project64/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/project64/project64/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/project64/project64/git/refs{/sha}","trees_url":"https://api.github.com/repos/project64/project64/git/trees{/sha}","statuses_url":"https://api.github.com/repos/project64/project64/statuses/{sha}","languages_url":"https://api.github.com/repos/project64/project64/languages","stargazers_url":"https://api.github.com/repos/project64/project64/stargazers","contributors_url":"https://api.github.com/repos/project64/project64/contributors","subscribers_url":"https://api.github.com/repos/project64/project64/subscribers","subscription_url":"https://api.github.com/repos/project64/project64/subscription","commits_url":"https://api.github.com/repos/project64/project64/commits{/sha}","git_commits_url":"https://api.github.com/repos/project64/project64/git/commits{/sha}","comments_url":"https://api.github.com/repos/project64/project64/comments{/number}","issue_comment_url":"https://api.github.com/repos/project64/project64/issues/comments{/number}","contents_url":"https://api.github.com/repos/project64/project64/contents/{+path}","compare_url":"https://api.github.com/repos/project64/project64/compare/{base}...{head}","merges_url":"https://api.github.com/repos/project64/project64/merges","archive_url":"https://api.github.com/repos/project64/project64/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/project64/project64/downloads","issues_url":"https://api.github.com/repos/project64/project64/issues{/number}","pulls_url":"https://api.github.com/repos/project64/project64/pulls{/number}","milestones_url":"https://api.github.com/repos/project64/project64/milestones{/number}","notifications_url":"https://api.github.com/repos/project64/project64/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/project64/project64/labels{/name}","releases_url":"https://api.github.com/repos/project64/project64/releases{/id}","created_at":"2014-11-21T01:59:14Z","updated_at":"2015-06-21T02:53:25Z","pushed_at":"2015-06-23T23:37:32Z","git_url":"git://github.com/project64/project64.git","ssh_url":"git@github.com:project64/project64.git","clone_url":"https://github.com/project64/project64.git","svn_url":"https://github.com/project64/project64","homepage":"http://www.pj64-emu.com/","size":39738,"stargazers_count":100,"watchers_count":100,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":40,"mirror_url":null,"open_issues_count":92,"forks":40,"open_issues":92,"watchers":100,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/project64/project64/pulls/525"},"html":{"href":"https://github.com/project64/project64/pull/525"},"issue":{"href":"https://api.github.com/repos/project64/project64/issues/525"},"comments":{"href":"https://api.github.com/repos/project64/project64/issues/525/comments"},"review_comments":{"href":"https://api.github.com/repos/project64/project64/pulls/525/comments"},"review_comment":{"href":"https://api.github.com/repos/project64/project64/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/project64/project64/pulls/525/commits"},"statuses":{"href":"https://api.github.com/repos/project64/project64/statuses/5ad04ed06762d76351dea8ad916d81724ea6beb7"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"project64","id":4994272,"avatar_url":"https://avatars.githubusercontent.com/u/4994272?v=3","gravatar_id":"","url":"https://api.github.com/users/project64","html_url":"https://github.com/project64","followers_url":"https://api.github.com/users/project64/followers","following_url":"https://api.github.com/users/project64/following{/other_user}","gists_url":"https://api.github.com/users/project64/gists{/gist_id}","starred_url":"https://api.github.com/users/project64/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/project64/subscriptions","organizations_url":"https://api.github.com/users/project64/orgs","repos_url":"https://api.github.com/users/project64/repos","events_url":"https://api.github.com/users/project64/events{/privacy}","received_events_url":"https://api.github.com/users/project64/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":1,"additions":6,"deletions":6,"changed_files":1}}