chiark / gitweb /
Merge commit '351bb29ade66bed0b3b147cd790293d206127c95'
authorLawrence Johnston <Lawrence.B.Johnston@gmail.com>
Sun, 11 Mar 2012 21:57:57 +0000 (14:57 -0700)
committerLawrence Johnston <Lawrence.B.Johnston@gmail.com>
Sun, 11 Mar 2012 21:57:57 +0000 (14:57 -0700)
commitf160894298855775b676d62bd4de9447aac282f9
treecea7e8d923486b09f3f1a48ced8190b62c87b414
parentc70edc80de66d3135a08dec519e178bad8b56825
parent351bb29ade66bed0b3b147cd790293d206127c95
Merge commit '351bb29ade66bed0b3b147cd790293d206127c95'

* commit '351bb29ade66bed0b3b147cd790293d206127c95':
  Fixed flip options, added show log when slicing fails, fixed bug in comb module