summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-12-30 01:50:23 +0000
committerMike Frysinger <vapier@gentoo.org>2006-12-30 01:50:23 +0000
commit83d0bd0347bdfc69f0040876f683049cb640cc17 (patch)
tree5990f93e9eb6a2990aa104f76b05d355f6cd28cb /app-shells/bash/ChangeLog
parentFixed deps for python-2.5 (thanks to Jokey). Fixed bug #148456 (by removing e... (diff)
downloadgentoo-2-83d0bd0347bdfc69f0040876f683049cb640cc17.tar.gz
gentoo-2-83d0bd0347bdfc69f0040876f683049cb640cc17.tar.bz2
gentoo-2-83d0bd0347bdfc69f0040876f683049cb640cc17.zip
Merge the dot bashrc and global bashrc #148812 by Sebastian Rijkers.
(Portage version: 2.1.2_rc4-r2)
Diffstat (limited to 'app-shells/bash/ChangeLog')
-rw-r--r--app-shells/bash/ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 7c4c56a2a054..25cbdff7b357 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-shells/bash
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.126 2006/12/16 03:07:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.127 2006/12/30 01:50:23 vapier Exp $
+
+ 30 Dec 2006; Mike Frysinger <vapier@gentoo.org> files/bashrc,
+ files/dot-bashrc:
+ Merge the dot bashrc and global bashrc #148812 by Sebastian Rijkers.
*bash-3.2_p9 (16 Dec 2006)