Change 5539

samwise (Sam Stafford)
Sam Stafford committed this change into //guest/sam_stafford/calamari
Request Review
Download .zip
Kick off another window to merge alpha channels, if present.
  • Files 11
  • Comments 0
11 edited 0 added 0 deleted
BaseWidget.cpp#3
Loading...
BaseWidget.h#6
Loading...
CalamariWindow.cpp#13
Loading...
CalamariWindow.h#10
Loading...
DiffWidget.cpp#8
Loading...
DiffWidget.h#5
Loading...
MergeEditor.cpp#6
Loading...
MergeWidget.cpp#7
Loading...
MergeWidget.h#7
Loading...
Version#2
Loading...
calamari.vcproj#13
Loading...
Tip: Use n and p to cycle through the changes.