projects / users / hanada / postgres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aededd7 14ed773)
Merge branch 'master' into fdw_syntax
authorShigeru Hanada <[email protected]>
Fri, 17 Dec 2010 00:40:19 +0000 (09:40 +0900)
committerShigeru Hanada <[email protected]>
Fri, 17 Dec 2010 00:40:19 +0000 (09:40 +0900)
Conflicts:
src/include/catalog/catversion.h

1  2 
src/include/catalog/pg_proc.h patch | diff1 | diff2 | blob | history
src/include/utils/builtins.h patch | diff1 | diff2 | blob | history

diff --cc src/include/catalog/pg_proc.h
Simple merge
diff --cc src/include/utils/builtins.h
Simple merge
Hanada's development tree.