On maandag 10 oktober 2011, Derek Atkins wrote: > Hey, > > Geert Janssens <gjanss...@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 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. Geert _______________________________________________ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
