view etc/images/smilies/medium/dead.xpm @ 111679:33ed3cf8260b

Initial support for unified DVCS pull and merge. * lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars. (vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull) (vc-bzr-merge-branch): New functions, implementing merge-branch and pull operations. * lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available. Accept optional prefix arg meaning to prompt for a command. (vc-update): Use vc-BACKEND-pull if available. Accept optional prefix arg meaning to prompt for a command. (vc-pull): Alias for vc-update.

/* XPM */
static char * dead_xpm[] = {
"16 16 9 1",
" 	c None",
".	c #000000",
"+	c #1D1900",
"@	c #887500",
"#	c #D3B600",
"$	c #FAD800",
"%	c #645600",
"&	c #FFDD00",
"*	c #8F7B00",
"     ......     ",
"   .+@#$$#@+.   ",
"  .%$&&&&&&$%.  ",
" .%*#&#*$#&#*%. ",
" +$#.#.##.#.#$+ ",
".@&&#.$&&$.#&&@.",
".#&#.#.$$.#.#&#.",
".$&*#&#*$#&#*&$.",
".$&.&&&&&&&&.&$.",
".#&#.&&&&&&.#&#.",
".@&&*.&&&&.*&&@.",
" +$&&*....*&&$+ ",
" .%&&&&&&&&&&%. ",
"  .%$&&&&&&$%.  ",
"   .+@#$$#@+.   ",
"     ......     "};