projects / users / bernd / postgres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38208c9 3fec606)
Add files from parent branch HEAD:
authorbranch-fixup <branch-fixup>
Sat, 5 Nov 2005 03:05:05 +0000 (03:05 +0000)
committerbranch-fixup <branch-fixup>
Sat, 5 Nov 2005 03:05:05 +0000 (03:05 +0000)
src/backend/postmaster/postmaster.c
src/backend/storage/lmgr/lock.c
src/backend/utils/error/elog.c
src/backend/utils/misc/ps_status.c
src/include/libpq/libpq-be.h
src/include/utils/ps_status.h


Trivial merge
Bernd Helmle's repository