Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update default
hg pull -r default https://bitbucket.org/ubershmekel/epilog
hg merge f8e783b0dda7
hg commit -m 'Merged in ubershmekel/epilog (pull request #1)'
The change to the makefile was to avoid
epilog.c:(.text+0xdde): undefined reference to `sqrt'
And the changes to the executable paths were because they were wrong on my system and they should be in the environment variable paths anyway.
Tested to fix compile on 14.04 too