summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/updates/4Q-20121
2 files changed, 5 insertions, 1 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 707fc82d92a6..ff771a81dae6 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7113 2012/11/06 22:30:01 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7114 2012/11/07 15:55:39 jlec Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 07 Nov 2012; Justin Lecher <jlec@gentoo.org> updates/4Q-2012:
+ move app-office/texmakerx app-office/texstudio; upstream renaming
+
06 Nov 2012; Theo Chatzimichos <tampakrap@gentoo.org> package.mask:
Add puppet-syntax in p.mask as well
diff --git a/profiles/updates/4Q-2012 b/profiles/updates/4Q-2012
index 6a5369d87a8e..b0699e7bdd56 100644
--- a/profiles/updates/4Q-2012
+++ b/profiles/updates/4Q-2012
@@ -42,3 +42,4 @@ slotmove dev-util/boost-build 1.50 0
slotmove dev-util/boost-build 1.51 0
slotmove net-im/emesene 2 0
move sci-chemistry/mmtk sci-libs/mmtk
+move app-office/texmakerx app-office/texstudio