r21410 - gnucash/branches/2.4/packaging/win32 - [21408] Use "Nimbus" gtk theme on Windows.

Derek Atkins warlord at MIT.EDU
Mon Oct 10 11:21:11 EDT 2011

Geert Janssens <janssens-geert at telenet.be> writes:

>> > Conflicts:
>> > 	packaging/win32/dist-impl.sh
>> What is the "Conflicts" thing?
>> -derek
> Oh, I guess that's a git artefact.
> I started with cherry-picking the dist-impl.sh changes from trunk to 2.4, but 
> that failed because the files were too different. So I manually edited the 
> file in 2.4, but apparently the git commit message still had a comment 
> regarding the failed cherry-pick. I hadn't noticed.
> The commit itself is clean though, so we can probably ignore this message.

Yeah, I just noticed it's in the log comment.  Sorry for the false alarm.

> Geert


       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord at MIT.EDU                        PGP key available

More information about the gnucash-devel mailing list