comparison lisp/mpc.el @ 107617:c5f9e4613394

Merge from mainline.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 16 Jan 2010 06:57:09 -0500
parents 1d1d5d9bd884
children d59e6301c2cd 376148b31b5e
comparison
equal deleted inserted replaced
107616:fa5ad3eee9f5 107617:c5f9e4613394
1 ;;; mpc.el --- A client for the Music Player Daemon -*- coding: utf-8 -*- 1 ;;; mpc.el --- A client for the Music Player Daemon -*- coding: utf-8 -*-
2 2
3 ;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 3 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
4 4
5 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> 5 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
6 ;; Keywords: multimedia 6 ;; Keywords: multimedia
7 7
8 ;; This file is part of GNU Emacs. 8 ;; This file is part of GNU Emacs.