view etc/images/gnus/unimportant.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.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 22 Nov 2010 20:15:08 -0500
parents 210af0ad3d35
children
line wrap: on
line source

/* XPM */
static char *magick[] = {
/* columns rows colors chars-per-pixel */
"24 24 2  1",
"! c blue",
"w c Gray75",
/* pixels */
"wwwwwwwwwwwwwwwwwwwwwwww",
"wwwwwwwwwwwwwwwwwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"ww!!!wwwwww!!!wwwwww!!!w",
"www!!!wwwww!!!wwwww!!!ww",
"wwww!!!wwww!!!wwww!!!www",
"wwwww!!!www!!!www!!!wwww",
"wwwwww!!!ww!!!ww!!!wwwww",
"wwwwwww!!!w!!!w!!!wwwwww",
"wwwwwwww!!!!!!!!!wwwwwww",
"wwwwwwwww!!!!!!!wwwwwwww",
"wwwwwwwwww!!!!!wwwwwwwww",
"wwwwwwwwwww!!!wwwwwwwwww",
"wwwwwwwwwwwwwwwwwwwwwwww",
"wwwwwwwwwwwwwwwwwwwwwwww"
};