diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-02-07 22:54:30 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-02-07 22:54:30 +0400 |
| commit | d2617b641d045b811cbc1c92411ef399a0ecdb90 (patch) | |
| tree | 7b325f49dff2757c31050d4f64a99f06d8ff4a9e /extras | |
| parent | 5f51353e84fad242d4c6e746bb15f9f865571487 (diff) | |
| parent | 6dd490910dd631627d78dce4499f87eabe463ab4 (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
main/src/addins/NUnit/MonoDevelop.NUnit.csproj
main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
version-checks
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/MonoDevelop.Database/configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/MonoDevelop.Database/configure.in b/extras/MonoDevelop.Database/configure.in index c06c0fc278..094f1247cc 100644 --- a/extras/MonoDevelop.Database/configure.in +++ b/extras/MonoDevelop.Database/configure.in @@ -1,4 +1,4 @@ -AC_INIT([monodevelop-database], 4.2.3, [monodevelop-list@lists.ximian.com]) +AC_INIT([monodevelop-database], m4_esyscmd_s([grep ^Version ../../version.config|cut -d '=' -f 2|tr -d '\n']), [monodevelop-list@lists.ximian.com]) AC_PREREQ(2.53) AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_MAINTAINER_MODE |