projects / dcpomatic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 684ec3d) | patch
Don't fail to build when we're on a merge commit.
authorCarl Hetherington <cth@carlh.net>
Wed, 9 Nov 2016 16:02:06 +0000 (16:02 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 9 Nov 2016 16:02:06 +0000 (16:02 +0000)
commit3368e09b69057abfbe5548c8e29467e181212024
treeb0d665cf9bac880837c42d0e5bdbf6163e1efa98tree | snapshot
parent684ec3d7ba201649f33e9497ffd6cf57ef5b4cbfcommit | diff
Don't fail to build when we're on a merge commit.
wscript diff | blob | history
Development branch of dcpomatic