wok diff emacs/description.txt @ rev 14592

Merge commit
author: Stanislas Leduc <shann@slitaz.org>
date: Sun May 26 23:46:07 2013 +0200 (2013-05-26)
parents: 12de48f5338a
     1.1 --- a/emacs/description.txt	Sat Jul 12 11:46:07 2008 +0200
     1.2 +++ b/emacs/description.txt	Sun May 26 23:46:07 2013 +0200
     1.3 @@ -3,5 +3,3 @@
     1.4  the Lisp programming language with extensions to support text 
     1.5  editing and much more.
     1.6  
     1.7 -Emacs has been stripped down for SliTaz: POP mail, x-window,
     1.8 -games, sound, info, man pages, Lisp sources are not available.
author	Stanislas Leduc <shann@slitaz.org>
date	Sun May 26 23:46:07 2013 +0200 (2013-05-26)
parents	12de48f5338a
children