diff --git a/.gitattributes b/.gitattributes index dbcc8fbb4e..ca97c0e6b6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7343,8 +7343,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.0.3.lpl svneol=native#text/plain -packager/globallinks/lclbase-1.4.0.3.lpl svneol=native#text/plain +packager/globallinks/lcl-1.4.0.4.lpl svneol=native#text/plain +packager/globallinks/lclbase-1.4.0.4.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 diff --git a/debian/changelog b/debian/changelog index eb00fda457..107584e65f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ lazarus (1.4RC3-0) unstable; urgency=low * Snapshot building. - -- Mattias Gaertner Sat, 28 Feb 2015 12:54:12 +0100 + -- Mattias Gaertner Sat, 5 Apr 2015 00:20:12 +0200 lazarus (1.4RC2-0) unstable; urgency=low diff --git a/ide/lazarus.res b/ide/lazarus.res index 5b6d166c20..2a52a83394 100644 Binary files a/ide/lazarus.res and b/ide/lazarus.res differ diff --git a/ide/version.inc b/ide/version.inc index e8c9a223eb..457458febb 100644 --- a/ide/version.inc +++ b/ide/version.inc @@ -1 +1 @@ -'1.4RC3' +'1.4RC4' diff --git a/lazarus.app/Contents/Info.plist b/lazarus.app/Contents/Info.plist index b4e39b3484..8a468e0854 100644 --- a/lazarus.app/Contents/Info.plist +++ b/lazarus.app/Contents/Info.plist @@ -148,7 +148,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - Lazarus IDE v1.4RC3 + Lazarus IDE v1.4RC4 CFBundleSignature laza CFBundleVersion diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk index 4cd2d5a104..1bc2e04c18 100644 --- a/lcl/interfaces/lcl.lpk +++ b/lcl/interfaces/lcl.lpk @@ -127,7 +127,7 @@ end;"/> "/> - + diff --git a/lcl/lclbase.lpk b/lcl/lclbase.lpk index e611f6fed5..6e537046d4 100644 --- a/lcl/lclbase.lpk +++ b/lcl/lclbase.lpk @@ -26,7 +26,7 @@ "/> - + diff --git a/lcl/lclversion.pas b/lcl/lclversion.pas index 9b001f3080..99231d87ad 100644 --- a/lcl/lclversion.pas +++ b/lcl/lclversion.pas @@ -35,9 +35,9 @@ const lcl_major = 1; lcl_minor = 4; lcl_release = 0; - lcl_patch = 3; + lcl_patch = 4; lcl_fullversion = ((lcl_major * 100 + lcl_minor) * 100 + lcl_release) * 100 + lcl_patch; - lcl_version = '1.4.0.3'; + lcl_version = '1.4.0.4'; implementation diff --git a/packager/globallinks/lcl-1.4.0.3.lpl b/packager/globallinks/lcl-1.4.0.4.lpl similarity index 100% rename from packager/globallinks/lcl-1.4.0.3.lpl rename to packager/globallinks/lcl-1.4.0.4.lpl diff --git a/packager/globallinks/lclbase-1.4.0.3.lpl b/packager/globallinks/lclbase-1.4.0.4.lpl similarity index 100% rename from packager/globallinks/lclbase-1.4.0.3.lpl rename to packager/globallinks/lclbase-1.4.0.4.lpl diff --git a/tools/install/linux/environmentoptions.xml b/tools/install/linux/environmentoptions.xml index 6f9f554a1a..fa6ef6b785 100644 --- a/tools/install/linux/environmentoptions.xml +++ b/tools/install/linux/environmentoptions.xml @@ -1,7 +1,7 @@ - + diff --git a/tools/install/macosx/environmentoptions.xml b/tools/install/macosx/environmentoptions.xml index 54323d685a..3577ff7d51 100644 --- a/tools/install/macosx/environmentoptions.xml +++ b/tools/install/macosx/environmentoptions.xml @@ -1,7 +1,7 @@ - + diff --git a/tools/install/win/environmentoptions.xml b/tools/install/win/environmentoptions.xml index 840fa535af..6649b09008 100644 --- a/tools/install/win/environmentoptions.xml +++ b/tools/install/win/environmentoptions.xml @@ -1,7 +1,7 @@ - +