projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2cda13 66aacf2)
Merge.
authorCarl Hetherington <cth@carlh.net>
Sat, 14 Feb 2015 21:37:28 +0000 (21:37 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 14 Feb 2015 21:37:28 +0000 (21:37 +0000)
1  2 
TO_PORT patch | diff1 | diff2 | blob | history
src/wx/about_dialog.cc patch | diff1 | diff2 | blob | history

diff --cc TO_PORT
index 441eb1a6717b5d991b6e02fd7f3747985d13136d,0abec4227759cb198df10e1d9c46941740ac9182..29155e0218a60d141b1746c5606c5b9359c74520
--- 1/TO_PORT
--- 2/TO_PORT
+++ b/TO_PORT
@@@ -1,3 -1,3 +1,4 @@@
  e6c9d208c52fb6f8bc29469e7d263bd03b22fe48
  31894d178c8f6a3378b1c25c7ea1971f78759156
 +bb2bdf010dd2ea813f9ac7af5023ce39cf14f572
+ c065accc4b4c6ed268e7fccea77a958473be7785
diff --cc src/wx/about_dialog.cc
Simple merge
2.0 development branch of dcpomatic