Mercurial > emacs
comparison lib-src/profile.c @ 83332:6c13700d1c13
Merged from miles@gnu.org--gnu-2005 (patch 469)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-469
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-372
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 05 Jul 2005 22:22:24 +0000 |
parents | 23a17af379b1 |
children | 6358e3c6075c f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
83331:efa9e4606e7e | 83332:6c13700d1c13 |
---|---|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 GNU General Public License for more details. | 16 GNU General Public License for more details. |
17 | 17 |
18 You should have received a copy of the GNU General Public License | 18 You should have received a copy of the GNU General Public License |
19 along with GNU Emacs; see the file COPYING. If not, write to | 19 along with GNU Emacs; see the file COPYING. If not, write to |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02111-1307, USA. */ | 21 Boston, MA 02110-1301, USA. */ |
22 | 22 |
23 | 23 |
24 /** | 24 /** |
25 ** To be run as an emacs process. Input string that starts with: | 25 ** To be run as an emacs process. Input string that starts with: |
26 ** 'z' -- resets the watch (to zero). | 26 ** 'z' -- resets the watch (to zero). |