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

[Derek Atkins]

Hey,

Geert Janssens <gjanssens at code.gnucash.org> writes:

> Author: gjanssens
> Date: 2011-10-09 17:18:08 -0400 (Sun, 09 Oct 2011)
> New Revision: 21410
> Trac: http://svn.gnucash.org/trac/changeset/21410
>
> Modified:
>    gnucash/branches/2.4/packaging/win32/dist-impl.sh
> Log:
> [21408] Use "Nimbus" gtk theme on Windows.
> A previous attempt failed to set this in the installer.
>
>
> Conflicts:
>
> 	packaging/win32/dist-impl.sh

What is the "Conflicts" thing?

-derek
-- 
       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