Mercurial > emacs
comparison etc/tutorials/TUTORIAL @ 112228:417b1e4d63cd
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 14 Jan 2011 12:18:41 -0500 |
| parents | bd12e9f7bf79 376148b31b5e |
| children | ef719132ddfa |
comparison
equal
deleted
inserted
replaced
| 112227:07e52ed69b5d | 112228:417b1e4d63cd |
|---|---|
| 1120 | 1120 |
| 1121 This version of the tutorial is a part of GNU Emacs. It is copyrighted | 1121 This version of the tutorial is a part of GNU Emacs. It is copyrighted |
| 1122 and comes with permission to distribute copies on certain conditions: | 1122 and comes with permission to distribute copies on certain conditions: |
| 1123 | 1123 |
| 1124 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006, | 1124 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006, |
| 1125 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 1125 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 1126 | 1126 |
| 1127 This file is part of GNU Emacs. | 1127 This file is part of GNU Emacs. |
| 1128 | 1128 |
| 1129 GNU Emacs is free software: you can redistribute it and/or modify | 1129 GNU Emacs is free software: you can redistribute it and/or modify |
| 1130 it under the terms of the GNU General Public License as published by | 1130 it under the terms of the GNU General Public License as published by |
