# HG changeset patch # User Oleksandr Gavenko # Date 1230048299 -7200 # Node ID 3d1b437969cb78284aeb405d5086e5c224f30f6e # Parent fcea9d3b79e1d85842ea492d0fe9f13cac3f2c5e# Parent 6b6e3f8cb371d710f95981ae5a3a638aba9b89b3 merge diff -r fcea9d3b79e1 -r 3d1b437969cb .emacs --- a/.emacs Tue Dec 23 18:04:28 2008 +0200 +++ b/.emacs Tue Dec 23 18:04:59 2008 +0200 @@ -2,6 +2,8 @@ ;; ;; Copyright (C) 2008 by Oleksandr Gavenko ;; +;; This file placed in public domain. +;; ;; ~/.emacs firstly load ~/.emacs-pre, then ~/.emacs-my, then ~/.emacs-post. ;; ====================================================================== diff -r fcea9d3b79e1 -r 3d1b437969cb .emacs-my --- a/.emacs-my Tue Dec 23 18:04:28 2008 +0200 +++ b/.emacs-my Tue Dec 23 18:04:59 2008 +0200 @@ -2,6 +2,9 @@ ;; ;; Copyright (C) 2008 by Oleksandr Gavenko ;; +;; This file formed from parts from many places and +;; placed in public domain. +;; ;; .emacs file for GNU Emacs. ;; ;; ~/.emacs load this file after ~/.emacs-pre, but before ~/.emacs-post.