summaryrefslogtreecommitdiff
path: root/db/env
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-09-19 21:06:40 +0000
committerjbj <devnull@localhost>2002-09-19 21:06:40 +0000
commit2376437b8faec79eb8ccaa874f271d4ee69d276f (patch)
treefc29754122bfce5816757e4c77f781c52a4d75c4 /db/env
parent4a15060bcbf38c550f7dcc86ceff277854f9eecf (diff)
downloadlibrpm-tizen-2376437b8faec79eb8ccaa874f271d4ee69d276f.tar.gz
librpm-tizen-2376437b8faec79eb8ccaa874f271d4ee69d276f.tar.bz2
librpm-tizen-2376437b8faec79eb8ccaa874f271d4ee69d276f.zip
Conflict resolved.
CVS patchset: 5722 CVS date: 2002/09/19 21:06:40
Diffstat (limited to 'db/env')
-rw-r--r--db/env/db_salloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/env/db_salloc.c b/db/env/db_salloc.c
index 881c63bbd..0961ac420 100644
--- a/db/env/db_salloc.c
+++ b/db/env/db_salloc.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const char revid[] = "Id: db_salloc.c,v 11.15 2002/02/22 01:55:53 mjc Exp ";
+static const char revid[] = "Id: db_salloc.c,v 11.16 2002/08/24 20:27:25 bostic Exp ";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES