Index: branches/2020Q4/devel/gh/files/patch-vendor_github.com_muesli_termenv_termenv__unix.go =================================================================== --- branches/2020Q4/devel/gh/files/patch-vendor_github.com_muesli_termenv_termenv__unix.go (revision 551641) +++ branches/2020Q4/devel/gh/files/patch-vendor_github.com_muesli_termenv_termenv__unix.go (nonexistent) @@ -1,20 +0,0 @@ ---- vendor/github.com/muesli/termenv/termenv_unix.go.orig 2020-01-30 12:25:39 UTC -+++ vendor/github.com/muesli/termenv/termenv_unix.go -@@ -99,7 +99,7 @@ func termStatusReport(sequence int) (string, error) { - func readWithTimeout(f *os.File) (string, bool) { - var readfds syscall.FdSet - fd := f.Fd() -- readfds.Bits[fd/64] |= 1 << (fd % 64) -+ readfds.X__fds_bits[fd/64] |= 1 << (fd % 64) - - // Use select to attempt to read from os.Stdout for 100 ms - err := sysSelect(int(fd)+1, -@@ -110,7 +110,7 @@ func readWithTimeout(f *os.File) (string, bool) { - // log.Printf("select(read stdout): %v", err) - return "", false - } -- if readfds.Bits[fd/64]&(1<<(fd%64)) == 0 { -+ if readfds.X__fds_bits[fd/64]&(1<<(fd%64)) == 0 { - // log.Print("select(read timeout)") - return "", false - } Property changes on: branches/2020Q4/devel/gh/files/patch-vendor_github.com_muesli_termenv_termenv__unix.go ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q4/devel/gh/Makefile =================================================================== --- branches/2020Q4/devel/gh/Makefile (revision 551641) +++ branches/2020Q4/devel/gh/Makefile (revision 551642) @@ -1,109 +1,111 @@ # $FreeBSD$ PORTNAME= gh DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0 +DISTVERSION= 1.1.0 CATEGORIES= devel MAINTAINER= vulcan@wired.sh COMMENT= GitHub's official command line tool LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git USES= go:modules USE_GITHUB= yes GH_ACCOUNT= cli GH_PROJECT= ${GH_ACCOUNT} -GH_TUPLE= AlecAivazis:survey:v2.1.1:survey_v2/vendor/github.com/AlecAivazis/survey/v2 \ +GH_TUPLE= AlecAivazis:survey:v2.1.1:alecaivazis_survey_v2/vendor/github.com/AlecAivazis/survey/v2 \ MakeNowJust:heredoc:v1.0.0:makenowjust_heredoc/vendor/github.com/MakeNowJust/heredoc \ alecthomas:chroma:v0.7.3:alecthomas_chroma/vendor/github.com/alecthomas/chroma \ briandowns:spinner:v1.11.1:briandowns_spinner/vendor/github.com/briandowns/spinner \ charmbracelet:glamour:1246d13c1684:charmbracelet_glamour/vendor/github.com/charmbracelet/glamour \ cli:shurcooL-graphql:0f7232a2bf7e:cli_shurcool_graphql/vendor/github.com/shurcooL/graphql \ cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \ danwakefield:fnmatch:cbb64ac3d964:danwakefield_fnmatch/vendor/github.com/danwakefield/fnmatch \ + davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ dlclark:regexp2:v1.2.0:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \ + enescakir:emoji:v1.0.0:enescakir_emoji/vendor/github.com/enescakir/emoji \ fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \ go-yaml:yaml:eeeca48fe776:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \ go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ golang:crypto:5c72a883971a:golang_crypto/vendor/golang.org/x/crypto \ golang:net:ab3426394381:golang_net/vendor/golang.org/x/net \ golang:sys:669c56c373c4:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \ - google:goterm:555d40f:google_goterm/vendor/github.com/google/goterm \ + google:go-cmp:v0.5.2:google_go_cmp/vendor/github.com/google/go-cmp \ google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \ hashicorp:go-version:v1.2.1:hashicorp_go_version/vendor/github.com/hashicorp/go-version \ henvic:httpretty:v0.0.6:henvic_httpretty/vendor/github.com/henvic/httpretty \ + inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \ kballard:go-shellquote:95032a82bc51:kballard_go_shellquote/vendor/github.com/kballard/go-shellquote \ lucasb-eyer:go-colorful:v1.0.3:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ mattn:go-colorable:v0.1.7:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ mattn:go-runewidth:v0.0.9:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ mgutz:ansi:d51e80ef957d:mgutz_ansi/vendor/github.com/mgutz/ansi \ microcosm-cc:bluemonday:v1.0.2:microcosm_cc_bluemonday/vendor/github.com/microcosm-cc/bluemonday \ mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ muesli:reflow:v0.1.0:muesli_reflow/vendor/github.com/muesli/reflow \ - muesli:termenv:v0.6.0:muesli_termenv/vendor/github.com/muesli/termenv \ + muesli:termenv:v0.7.2:muesli_termenv/vendor/github.com/muesli/termenv \ olekukonko:tablewriter:v0.0.4:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \ + pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ rivo:uniseg:v0.1.0:rivo_uniseg/vendor/github.com/rivo/uniseg \ russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \ shurcooL:githubv4:f27d2ca7f6d5:shurcool_githubv4/vendor/github.com/shurcooL/githubv4 \ shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \ spf13:cobra:v1.0.0:spf13_cobra/vendor/github.com/spf13/cobra \ spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \ + stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \ yuin:goldmark:v1.2.0:yuin_goldmark/vendor/github.com/yuin/goldmark _BUILD_VERSION= ${DISTVERSION} _BUILD_DATE= $$(date +%Y-%m-%d) GO_TARGET= ./cmd/${PORTNAME} GO_BUILDFLAGS= -ldflags "\ -s -w \ -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/command.Version=${_BUILD_VERSION} \ -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/command.BuildDate=${_BUILD_DATE}" _DOCS= README.md docs/gh-vs-hub.md docs/releasing.md \ docs/command-line-syntax.md docs/source.md PORTDOCS= ${_DOCS:T} OPTIONS_DEFINE= COMPLETIONS DOCS MANPAGES OPTIONS_DEFAULT= COMPLETIONS MANPAGES OPTIONS_SUB= yes COMPLETIONS_DESC= Build and install shell completions for bash, fish and zsh MANPAGES_DESC= Build and install auto-generated manpages - -pre-build: - ${LN} -sf ${WRKSRC_muesli_termenv}/termenv_linux.go ${WRKSRC_muesli_termenv}/termenv_freebsd.go do-build-COMPLETIONS-on: .for SHELL in bash fish zsh ${GO_WRKDIR_BIN}/${PORTNAME} completion -s ${SHELL} > ${GO_WRKSRC}/${SHELL} .endfor do-build-MANPAGES-on: cd ${GO_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} run ${GO_BUILDFLAGS} ./cmd/gen-docs --man-page --doc-path docs/man 2>/dev/null post-install-COMPLETIONS-on: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${GO_WRKSRC}/bash \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME} @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions ${INSTALL_DATA} ${GO_WRKSRC}/fish \ ${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${GO_WRKSRC}/zsh \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${GO_WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${STAGEDIR}${DOCSDIR} post-install-MANPAGES-on: ${INSTALL_MAN} ${GO_WRKSRC}/docs/man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include Index: branches/2020Q4/devel/gh/distinfo =================================================================== --- branches/2020Q4/devel/gh/distinfo (revision 551641) +++ branches/2020Q4/devel/gh/distinfo (revision 551642) @@ -1,79 +1,89 @@ -TIMESTAMP = 1600514386 -SHA256 (cli-cli-v1.0.0_GH0.tar.gz) = e3d1c341829f5b885dce9aa2bf4bc84db48072752250f6fdb2d62903caf07cfb -SIZE (cli-cli-v1.0.0_GH0.tar.gz) = 337523 +TIMESTAMP = 1602060075 +SHA256 (cli-cli-v1.1.0_GH0.tar.gz) = 3340bcec77dd9cbb5074399effc876cb7d759a235d24ea11253ad7b232b620a2 +SIZE (cli-cli-v1.1.0_GH0.tar.gz) = 346517 SHA256 (AlecAivazis-survey-v2.1.1_GH0.tar.gz) = e60d2836f8e34c9fbc7addf0c304b662ce26ab5b67f7dc7bca5fbb9ca0e80055 SIZE (AlecAivazis-survey-v2.1.1_GH0.tar.gz) = 1564121 SHA256 (MakeNowJust-heredoc-v1.0.0_GH0.tar.gz) = 3703d1c9e659c274c5e2d712e4d66f60620e03513fc380b1d3acafb3ca037400 SIZE (MakeNowJust-heredoc-v1.0.0_GH0.tar.gz) = 3497 SHA256 (alecthomas-chroma-v0.7.3_GH0.tar.gz) = 1007e82cc44cea04542c282b19bab25a59cb1e53149aaa7f0e2d9ce72ba80114 SIZE (alecthomas-chroma-v0.7.3_GH0.tar.gz) = 615181 SHA256 (briandowns-spinner-v1.11.1_GH0.tar.gz) = 258a7aa19a98d3d507a5eb6d16da0458e8aae7df2f0d94231b96c1187df30c7a SIZE (briandowns-spinner-v1.11.1_GH0.tar.gz) = 1308985 SHA256 (charmbracelet-glamour-1246d13c1684_GH0.tar.gz) = 616e37132c977da5f10d488399604c370455deaf184202202919b60b46f4dd9c SIZE (charmbracelet-glamour-1246d13c1684_GH0.tar.gz) = 511604 SHA256 (cli-shurcooL-graphql-0f7232a2bf7e_GH0.tar.gz) = c8cabacb27c9025512da1d654a0010cf320ab5ccd58d7859ddb60dfa45433e64 SIZE (cli-shurcooL-graphql-0f7232a2bf7e_GH0.tar.gz) = 18506 SHA256 (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576 SIZE (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021 SHA256 (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f SIZE (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955 +SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e +SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 SHA256 (dlclark-regexp2-v1.2.0_GH0.tar.gz) = 9b4d25630d0ce86bcd518d79ce47365a84c7c75de2334b2708f1bddcc1df47fe SIZE (dlclark-regexp2-v1.2.0_GH0.tar.gz) = 204926 +SHA256 (enescakir-emoji-v1.0.0_GH0.tar.gz) = d62dc29e5a3f08b8de6fdb8919089cfa9a82c003466b0b1cb5feb33563612839 +SIZE (enescakir-emoji-v1.0.0_GH0.tar.gz) = 68908 SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755 SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449 SHA256 (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 77e421545f853bf0b0431ed5026f10ebeeadd436334ac156169b78f82e86bdf5 SIZE (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 88787 SHA256 (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045 SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732 SHA256 (golang-crypto-5c72a883971a_GH0.tar.gz) = 2b8df0754ba64c95786bc5fe2071cadf4757f754e774f5985d725c1aaa6cb3d8 SIZE (golang-crypto-5c72a883971a_GH0.tar.gz) = 1732429 SHA256 (golang-net-ab3426394381_GH0.tar.gz) = ddf23e17a147972ad0dd11824a912eaa0174cba60ab63da6ae6ced2c76345946 SIZE (golang-net-ab3426394381_GH0.tar.gz) = 1177700 SHA256 (golang-sys-669c56c373c4_GH0.tar.gz) = f2f087da5058912cdbb6901ba01dc06be9da08e7ac4da9efa9bd18bf3b3d86a1 SIZE (golang-sys-669c56c373c4_GH0.tar.gz) = 1050300 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185 SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332 -SHA256 (google-goterm-555d40f_GH0.tar.gz) = d90afebda315a4ffa4288d9ab73921b858b0ce766ebd812ae577a2a730165e8b -SIZE (google-goterm-555d40f_GH0.tar.gz) = 18297 +SHA256 (google-go-cmp-v0.5.2_GH0.tar.gz) = 76e0c4238e7fec1490ef2c8b4719a024ade7f4b8778965acb888566535ee9dd5 +SIZE (google-go-cmp-v0.5.2_GH0.tar.gz) = 99769 SHA256 (google-shlex-e7afc7fbc510_GH0.tar.gz) = 87f77e98720add261add169e386cbdcc894e2635dca299bc4119dc417ea321ca SIZE (google-shlex-e7afc7fbc510_GH0.tar.gz) = 7342 SHA256 (hashicorp-go-version-v1.2.1_GH0.tar.gz) = 9c63e2107ca0cf4e78ddba1128c73adfdfcdd45faa90c3bf7c6feda7d2326cc5 SIZE (hashicorp-go-version-v1.2.1_GH0.tar.gz) = 13911 SHA256 (henvic-httpretty-v0.0.6_GH0.tar.gz) = cb53b15e365f94d7cfb7d4a72448807c2fc5e42f831a340726ff950307575083 SIZE (henvic-httpretty-v0.0.6_GH0.tar.gz) = 43797 +SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6 +SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290 SHA256 (kballard-go-shellquote-95032a82bc51_GH0.tar.gz) = dde336eb697f7f9c26cf6d1467f75b6cf559262c1b0b110d28fff29790f76bc5 SIZE (kballard-go-shellquote-95032a82bc51_GH0.tar.gz) = 4328 SHA256 (lucasb-eyer-go-colorful-v1.0.3_GH0.tar.gz) = 40c8c7e03a4eeaaabd44273e9b6a992933f554f17225aadd0b225ffc67e1e7db SIZE (lucasb-eyer-go-colorful-v1.0.3_GH0.tar.gz) = 430208 SHA256 (mattn-go-colorable-v0.1.7_GH0.tar.gz) = e394441b47cb26bb0c60ffdf2c60d57facbbc39f7a60763fdb1ec752cb460abf SIZE (mattn-go-colorable-v0.1.7_GH0.tar.gz) = 9560 SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548 SHA256 (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 4f20a337ad06e071f29535afe9c5207d3e8840c8c86672bbc5f9837c6229c835 SIZE (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 16714 SHA256 (mgutz-ansi-d51e80ef957d_GH0.tar.gz) = 91cc2a4b9179dca81b3169ad32d4ef854d043c268251abf9a004bf7606fe3222 SIZE (mgutz-ansi-d51e80ef957d_GH0.tar.gz) = 5097 SHA256 (microcosm-cc-bluemonday-v1.0.2_GH0.tar.gz) = 63b0b5c2378fded0acb8b719b13a698cb897b52b3fb0cdf7d3ce576eba0c3160 SIZE (microcosm-cc-bluemonday-v1.0.2_GH0.tar.gz) = 137669 SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600 SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362 SHA256 (muesli-reflow-v0.1.0_GH0.tar.gz) = f558a7918af1727e5153fa20b4b03f619a4855485ab41e98b89e5474571afaed SIZE (muesli-reflow-v0.1.0_GH0.tar.gz) = 16189 -SHA256 (muesli-termenv-v0.6.0_GH0.tar.gz) = 433652366157451263781e24263588f845a44755cb3be7ea124c2d2508df1e73 -SIZE (muesli-termenv-v0.6.0_GH0.tar.gz) = 405133 +SHA256 (muesli-termenv-v0.7.2_GH0.tar.gz) = f4f7fbea1149d10eb0559f7edea90876317a710b30474bf6e3ba257fe0cb7a36 +SIZE (muesli-termenv-v0.7.2_GH0.tar.gz) = 405812 SHA256 (olekukonko-tablewriter-v0.0.4_GH0.tar.gz) = a86028430fb4dd99ce0030a7c4d37915337c3b9a9efbfd2698b375f3e3488bd0 SIZE (olekukonko-tablewriter-v0.0.4_GH0.tar.gz) = 19252 +SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda +SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 SHA256 (rivo-uniseg-v0.1.0_GH0.tar.gz) = b80dffa6c757687cc997b77efbd32435361829cb085b913424b9b2bfebc19655 SIZE (rivo-uniseg-v0.1.0_GH0.tar.gz) = 43971 SHA256 (russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff SIZE (russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613 SHA256 (shurcooL-githubv4-f27d2ca7f6d5_GH0.tar.gz) = 973cf5dfa6a5311c102fa937464dff6a488bbd6107af5bad150875d84788e223 SIZE (shurcooL-githubv4-f27d2ca7f6d5_GH0.tar.gz) = 41841 SHA256 (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 7e11964980f9b8595c17bc8970f0174621afe464920e38df7f8d77e45058388f SIZE (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 2143 SHA256 (spf13-cobra-v1.0.0_GH0.tar.gz) = 58dbfe1b4dbc6751575e94d1e62d073098e0b41790bc1c7a7a95ec6b870ac697 SIZE (spf13-cobra-v1.0.0_GH0.tar.gz) = 128897 SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808 SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796 +SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f +SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215 SHA256 (yuin-goldmark-v1.2.0_GH0.tar.gz) = 8888ceef3495b9798a7eef97c87e204d6b38a01e1c9bb58e555a9846f9b4b9db SIZE (yuin-goldmark-v1.2.0_GH0.tar.gz) = 228253 Index: branches/2020Q4/devel/gh/pkg-descr =================================================================== --- branches/2020Q4/devel/gh/pkg-descr (revision 551641) +++ branches/2020Q4/devel/gh/pkg-descr (revision 551642) @@ -1,13 +1,13 @@ GitHub CLI brings GitHub to your terminal. It reduces context switching, helps you focus, and enables -you to more easily script and create your own workflows. +you to more easily script and create your own workflows. It brings pull requests, issues, and other GitHub concepts to the terminal next to where you are already working with git and your code. The release version supports GitHub Enterprise Server in addition to GitHub.com. WWW: https://cli.github.com Index: branches/2020Q4 =================================================================== --- branches/2020Q4 (revision 551641) +++ branches/2020Q4 (revision 551642) Property changes on: branches/2020Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r551641