aboutsummaryrefslogtreecommitdiffstats
path: root/mandrake_desk.spec
diff options
context:
space:
mode:
authorChmouel Boudjnah <chmouel@mandriva.org>1999-12-25 19:13:58 +0000
committerChmouel Boudjnah <chmouel@mandriva.org>1999-12-25 19:13:58 +0000
commit5641f1914c8b1ca4bbdeb48c17e3ca82ae4ad24b (patch)
treeb37e4cda8a5f9a4f19b85f1f44116d5f7b0d54d4 /mandrake_desk.spec
parented4d0348075050d9d4d0b3b811734f5c904a2d80 (diff)
downloadcommon-data-5641f1914c8b1ca4bbdeb48c17e3ca82ae4ad24b.tar
common-data-5641f1914c8b1ca4bbdeb48c17e3ca82ae4ad24b.tar.gz
common-data-5641f1914c8b1ca4bbdeb48c17e3ca82ae4ad24b.tar.bz2
common-data-5641f1914c8b1ca4bbdeb48c17e3ca82ae4ad24b.tar.xz
common-data-5641f1914c8b1ca4bbdeb48c17e3ca82ae4ad24b.zip
"Seethechangelog"
Diffstat (limited to 'mandrake_desk.spec')
-rw-r--r--mandrake_desk.spec1
1 files changed, 0 insertions, 1 deletions
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 8ef2970..16c66f7 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -75,7 +75,6 @@ rm -rf $RPM_BUILD_ROOT
* Tue Dec 23 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
- included the mandrake.links* files formerly in gmc package
->>>>>>> 1.11
* Wed Dec 22 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
- sbin/fndSession: new script with the new chksession.
- sbin/chksession: a new greatest hit.