set fixes to 1.4.2

git-svn-id: branches/fixes_1_4@49519 -
This commit is contained in:
mattias 2015-07-11 08:19:15 +00:00
parent 1a288fb26b
commit 746d6f91c9
14 changed files with 18 additions and 24 deletions

4
.gitattributes vendored
View File

@ -7416,8 +7416,8 @@ packager/globallinks/lazutils-1.lpl svneol=native#text/plain
packager/globallinks/lazvlc-1.lpl svneol=native#text/plain
packager/globallinks/lazwebextra-0.9.lpl svneol=native#text/plain
packager/globallinks/lazwiki-1.0.1.lpl svneol=native#text/plain
packager/globallinks/lcl-1.4.1.lpl svneol=native#text/plain
packager/globallinks/lclbase-1.4.1.lpl svneol=native#text/plain
packager/globallinks/lcl-1.4.2.lpl svneol=native#text/plain
packager/globallinks/lclbase-1.4.2.lpl svneol=native#text/plain
packager/globallinks/leakview-1.lpl svneol=native#text/plain
packager/globallinks/lhelpcontrolpkg-0.2.lpl svneol=native#text/plain
packager/globallinks/lr_add_function-1.lpl svneol=native#text/plain

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
lazarus (1.4.2-0) unstable; urgency=low
* Snapshot building.
-- Mattias Gaertner <mattias@freepascal.org> Sat, 11 Jul 2015 10:16:12 +0200
lazarus (1.4.1-0) unstable; urgency=low
* Snapshot building.

View File

@ -23,7 +23,7 @@
<UseVersionInfo Value="True"/>
<MajorVersionNr Value="1"/>
<MinorVersionNr Value="4"/>
<RevisionNr Value="1"/>
<RevisionNr Value="2"/>
<CharSet Value="04B0"/>
<StringTable ProductName="Lazarus IDE" ProductVersion=""/>
</VersionInfo>
@ -1316,18 +1316,6 @@
<Filename Value="initialsetupproc.pas"/>
<IsPartOfProject Value="True"/>
</Unit239>
<Unit240>
<Filename Value="qfinitlocalvardlg.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="QFInitLocalVarDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
</Unit240>
<Unit241>
<Filename Value="../packager/interpkgconflictfiles.pas"/>
<IsPartOfProject Value="True"/>
<HasResources Value="True"/>
</Unit241>
</Units>
</ProjectOptions>
<CompilerOptions>

Binary file not shown.

View File

@ -1 +1 @@
'1.4.1'
'1.4.2'

View File

@ -148,7 +148,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>Lazarus IDE v1.4.1</string>
<string>Lazarus IDE v1.4.2</string>
<key>CFBundleSignature</key>
<string>laza</string>
<key>CFBundleVersion</key>

View File

@ -127,7 +127,7 @@ end;"/>
"/>
<License Value="modified LGPL-2
"/>
<Version Major="1" Minor="4" Release="1"/>
<Version Major="1" Minor="4" Release="2"/>
<Files Count="438">
<Item1>
<Filename Value="carbon/agl.pp"/>

View File

@ -26,7 +26,7 @@
"/>
<License Value="modified LGPL-2
"/>
<Version Major="1" Minor="4" Release="1"/>
<Version Major="1" Minor="4" Release="2"/>
<Files Count="278">
<Item1>
<Filename Value="checklst.pas"/>

View File

@ -34,10 +34,10 @@ interface
const
lcl_major = 1;
lcl_minor = 4;
lcl_release = 1;
lcl_release = 2;
lcl_patch = 0;
lcl_fullversion = ((lcl_major * 100 + lcl_minor) * 100 + lcl_release) * 100 + lcl_patch;
lcl_version = '1.4.1.0';
lcl_version = '1.4.2.0';
implementation

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<EnvironmentOptions>
<Version Value="107" Lazarus="1.4.1"/>
<Version Value="107" Lazarus="1.4.2"/>
<LazarusDirectory Value="__LAZARUSDIR__">
<History Count="1">
<Item1 Value="/usr/lib/lazarus/"/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<EnvironmentOptions>
<Version Value="107" Lazarus="1.4.1"/>
<Version Value="107" Lazarus="1.4.2"/>
<LazarusDirectory Value="/Developer/lazarus/">
<History Count="1">
<Item1 Value="/Developer/lazarus/"/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<EnvironmentOptions>
<Version Value="107" Lazarus="1.4.1"/>
<Version Value="107" Lazarus="1.4.2"/>
<LazarusDirectory Value="%LazDir%">
</LazarusDirectory>
<CompilerFilename Value="%FpcBinDir%\fpc.exe">