{"action":"created","issue":{"url":"https://api.github.com/repos/supertuxkart/stk-code/issues/2256","labels_url":"https://api.github.com/repos/supertuxkart/stk-code/issues/2256/labels{/name}","comments_url":"https://api.github.com/repos/supertuxkart/stk-code/issues/2256/comments","events_url":"https://api.github.com/repos/supertuxkart/stk-code/issues/2256/events","html_url":"https://github.com/supertuxkart/stk-code/issues/2256","id":98388182,"number":2256,"title":"build process edits pnglibconf.h file","user":{"login":"tobbi","id":583169,"avatar_url":"https://avatars.githubusercontent.com/u/583169?v=3","gravatar_id":"","url":"https://api.github.com/users/tobbi","html_url":"https://github.com/tobbi","followers_url":"https://api.github.com/users/tobbi/followers","following_url":"https://api.github.com/users/tobbi/following{/other_user}","gists_url":"https://api.github.com/users/tobbi/gists{/gist_id}","starred_url":"https://api.github.com/users/tobbi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tobbi/subscriptions","organizations_url":"https://api.github.com/users/tobbi/orgs","repos_url":"https://api.github.com/users/tobbi/repos","events_url":"https://api.github.com/users/tobbi/events{/privacy}","received_events_url":"https://api.github.com/users/tobbi/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":4,"created_at":"2015-07-31T13:08:26Z","updated_at":"2015-08-02T23:29:16Z","closed_at":null,"body":"During the build process, the pnglibconf.h file gets edited. This prevents merging with remote changes since you need to reset the tree to HEAD every time before you can merge.\r\n\r\nI hope there's a way to fix it.\r\n\r\nHere are the changes:\r\ndiff --git a/lib/libpng/pnglibconf.h b/lib/libpng/pnglibconf.h\r\nindex 8022a5a..49fcc8c 100644\r\n--- a/lib/libpng/pnglibconf.h\r\n+++ b/lib/libpng/pnglibconf.h\r\n@@ -3,7 +3,7 @@\r\n \r\n /* pnglibconf.h - library build configuration */\r\n \r\n-/* libpng version 1.5.4 - last changed on June 22, 2011 */\r\n+/* Libpng 1.5.9 - February 18, 2012 */\r\n \r\n /* Copyright (c) 1998-2011 Glenn Randers-Pehrson */"},"comment":{"url":"https://api.github.com/repos/supertuxkart/stk-code/issues/comments/127083568","html_url":"https://github.com/supertuxkart/stk-code/issues/2256#issuecomment-127083568","issue_url":"https://api.github.com/repos/supertuxkart/stk-code/issues/2256","id":127083568,"user":{"login":"tobbi","id":583169,"avatar_url":"https://avatars.githubusercontent.com/u/583169?v=3","gravatar_id":"","url":"https://api.github.com/users/tobbi","html_url":"https://github.com/tobbi","followers_url":"https://api.github.com/users/tobbi/followers","following_url":"https://api.github.com/users/tobbi/following{/other_user}","gists_url":"https://api.github.com/users/tobbi/gists{/gist_id}","starred_url":"https://api.github.com/users/tobbi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tobbi/subscriptions","organizations_url":"https://api.github.com/users/tobbi/orgs","repos_url":"https://api.github.com/users/tobbi/repos","events_url":"https://api.github.com/users/tobbi/events{/privacy}","received_events_url":"https://api.github.com/users/tobbi/received_events","type":"User","site_admin":false},"created_at":"2015-08-02T23:29:16Z","updated_at":"2015-08-02T23:29:16Z","body":"Couldn't we simply leave out the version number from both of these files? It's really the only difference between the template and the actual file."}}