diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
| commit | 0e1adc84d471955eaabe26486154e8ec44e91dd4 (patch) | |
| tree | e2363fb022bfa7b730b0032b4c35379aa2a997d6 /fontconfig/new-version.sh | |
| parent | e59b1896b907c5ecfe184723d4c6adc2c20fa678 (diff) | |
| parent | ddc05759f098f06bd93253a7bffe38640963dfb3 (diff) | |
| download | vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.gz vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.bz2 vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
mesalib/src/mapi/glapi/gen/.gitignore
mesalib/src/mesa/program/.gitignore
Diffstat (limited to 'fontconfig/new-version.sh')
| -rw-r--r-- | fontconfig/new-version.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fontconfig/new-version.sh b/fontconfig/new-version.sh index 3c620ae4c..39514302e 100644 --- a/fontconfig/new-version.sh +++ b/fontconfig/new-version.sh @@ -71,8 +71,8 @@ if [ $version != $last ]; then # header # (sed '/^2\.[0-9.]*/,$d' README | - sed -e "s/Version.*/Version $version_note/" \ - -e "s/200.*/$date/" | awk ' + sed -r -e "s/Version.*/Version $version_note/" \ + -e "s/[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/$date/" | awk ' /^[ \t]/ { gsub ("^[ \t]*", ""); gsub ("[ \t]*$", ""); |