view tests/test-issue612.out @ 10552:cc9f16a1f545 stable

contrib/wix: add COPYING.rtf Moving the file from the misc directory of the thg-winbuild repo, which uses mercurial's contrib/wix. This file is displayed by the install UI sequence, so it belongs to the WiX sources quite closely. It happens to be installed by the msi installer, too.
author Adrian Buehlmann <adrian@cadifra.com>
date Thu, 25 Feb 2010 14:56:09 +0100
parents 368a4ec603cc
children
line wrap: on
line source

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
? src/a.o
merging src/a.c and source/a.c to source/a.c
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M source/a.c
R src/a.c
? source/a.o