# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1197077955 0
# Node ID b8b9765bb434bd776ee9659716160167878360dc
# Parent  4b0ef62e1965f5cb35809099b19dd80dd7adc181
New file.

diff -r 4b0ef62e1965 -r b8b9765bb434 etc/ChangeLog
--- a/etc/ChangeLog	Sat Dec 08 01:06:12 2007 +0000
+++ b/etc/ChangeLog	Sat Dec 08 01:39:15 2007 +0000
@@ -1,3 +1,7 @@
+2007-12-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* emacs.desktop: New file.
+
 2007-11-30  Kentaro Ohkouchi  <nanasess@fsm.ne.jp>
 
 	* images/icons/macemacs_16.png, images/icons/macemacs_24.png:
diff -r 4b0ef62e1965 -r b8b9765bb434 etc/emacs.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/emacs.desktop	Sat Dec 08 01:39:15 2007 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Emacs
+GenericName=Text Editor
+Comment=Edit text
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=emacs %f
+Icon=emacs_32.png
+Type=Application
+Terminal=false
+Categories=Application;Development;TextEditor;
+Encoding=UTF-8
+StartupWMClass=Emacs