summaryrefslogtreecommitdiffstats
path: root/gnome1-libs/libgda
diff options
context:
space:
mode:
authorRobin Cook2006-10-09 09:17:19 -0500
committerRobin Cook2006-10-09 13:49:13 -0500
commit7fded16869db36d3b33ed4903af18ec497edacb7 (patch)
tree0eba0c6f84c5a60f361ce69d2734d16eeb1ab3eb /gnome1-libs/libgda
parente76ded54915c806a26cd0e2f1d10d82ee360d5a9 (diff)
libgda: added CONFLICTS
Diffstat (limited to 'gnome1-libs/libgda')
-rwxr-xr-xgnome1-libs/libgda/CONFLICTS2
-rw-r--r--gnome1-libs/libgda/HISTORY3
2 files changed, 5 insertions, 0 deletions
diff --git a/gnome1-libs/libgda/CONFLICTS b/gnome1-libs/libgda/CONFLICTS
new file mode 100755
index 0000000000..1fc0fa19bf
--- /dev/null
+++ b/gnome1-libs/libgda/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts libgda2 &&
+conflicts libgda2-dev
diff --git a/gnome1-libs/libgda/HISTORY b/gnome1-libs/libgda/HISTORY
index e1b7b6dfba..238521aa2a 100644
--- a/gnome1-libs/libgda/HISTORY
+++ b/gnome1-libs/libgda/HISTORY
@@ -1,3 +1,6 @@
+2006-10-09 Robin Cook <rcook@wyrms.net>
+ * CONFLICTS: added
+
2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed MAINTAINER.