annotate contrib/win32/mercurial.ico @ 17885:9a2cf955db84 stable

filemerge: use util.shellquote when calling merge (issue3581)
author Keegan Carruthers-Smith <keegancsmith@fb.com>
date Fri, 26 Oct 2012 12:02:58 -0700
parents 25ac72ca68f6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7659
25ac72ca68f6 Add Lee Cantey's installer icon to win32 installer
Pascal Quantin <pascal.quantin@wavecom.com>
parents:
diff changeset
1 (binary:image/vnd.microsoft.icon)