summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/kdebase/debian/changelog
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2011-08-20 22:17:03 -0400
committerRobert Xu <robxu9@gmail.com>2011-08-20 22:17:03 -0400
commit6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf (patch)
tree141e44b1b831644c739f3ec4e0bef2d10ef71da7 /ubuntu/maverick/kdebase/debian/changelog
parent7621ba87b889eccdea4958715c25de4b403ad705 (diff)
parent26f5630a822b38ef215210699e9e08e74143b38b (diff)
downloadtde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.tar.gz
tde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/kdebase/debian/changelog')
-rw-r--r--ubuntu/maverick/kdebase/debian/changelog8
1 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick/kdebase/debian/changelog b/ubuntu/maverick/kdebase/debian/changelog
index 5d6e57ac4..9742e6bde 100644
--- a/ubuntu/maverick/kdebase/debian/changelog
+++ b/ubuntu/maverick/kdebase/debian/changelog
@@ -152,7 +152,7 @@ kdebase-trinity (4:3.5.10-0ubuntu4~intrepid10) intrepid; urgency=low
kdebase-trinity (4:3.5.10-0ubuntu4~intrepid8) intrepid; urgency=low
- * Repaired plasma startup to autodetect KDE3/KDE4 and not run/run accordingly
+ * Repaired plasma startup to autodetect Trinity/KDE4 and not run/run accordingly
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 15 Apr 2009 11:37:00 -0600
@@ -202,7 +202,7 @@ kdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
kdebase-trinity (4:3.5.10-0ubuntu3~intrepid15) intrepid; urgency=low
- * Moved KDE3 to /opt/trinity
+ * Moved Trinity to /opt/trinity
* Integrated properly with KDE4.2+
* Removed unbuilt libraries khotkeys_arts.la and khotkeys_arts.so
@@ -258,7 +258,7 @@ kdebase-trinity (4:3.5.10-0ubuntu2~intrepid11) intrepid; urgency=low
kdebase-trinity (4:3.5.10-0ubuntu2~intrepid9) intrepid; urgency=low
- * Fixed KDE3 games path
+ * Fixed Trinity games path
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 01 Dec 2008 00:34:00 -0600
@@ -574,7 +574,7 @@ kdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low
+++ Changes by Armin Berres:
* Split off kdebase-bin-trinity which contains executables which can be provided by
- KDE3 or KDE4.
+ Trinity or KDE4.
+++ Changes by Ana Beatriz Guerrero Lopez: