Commit a2348eb62ccc8ab2e7a6d7e5cb5d4d259c9fbabe
Merge branch 'devel' into integration
Showing
6 changed files
with
9 additions
and
9 deletions
README.md
| 1 | 1 | ctools information |
| 2 | 2 | ================== |
| 3 | -* Version: 1.3.0 (7 June 2017) | |
| 3 | +* Version: 1.4.0.dev1 (7 June 2017) | |
| 4 | 4 | * Author: Juergen Knoedlseder (jurgen.knodlseder@irap.omp.eu) |
| 5 | -* GammaLib dependency: 1.3.0 | |
| 5 | +* GammaLib dependency: 1.4.0.dev1 | |
| 6 | 6 | |
| 7 | 7 | [](https://cta-jenkins.irap.omp.eu/job/ctools-integrate-os/) |
| 8 | 8 | ... | ... |
configure.ac
| ... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 | ############################################################################# |
| 29 | 29 | # Initialisation # |
| 30 | 30 | ############################################################################# |
| 31 | -AC_INIT([ctools], [1.3.0], [jurgen.knodlseder@irap.omp.eu], [ctools]) | |
| 31 | +AC_INIT([ctools], [1.4.0.dev1], [jurgen.knodlseder@irap.omp.eu], [ctools]) | |
| 32 | 32 | AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) |
| 33 | 33 | AC_CONFIG_MACRO_DIR([m4]) |
| 34 | 34 | #AM_INIT_AUTOMAKE([gnu no-dependencies foreign]) | ... | ... |
ctools.pc.in
| ... | ... | @@ -6,9 +6,9 @@ includedir=${prefix}/include |
| 6 | 6 | Name: ctools |
| 7 | 7 | Description: CTA science analysis tools |
| 8 | 8 | URL: http://cta.irap.omp.eu/ctools |
| 9 | -Version: 1.3.0 | |
| 9 | +Version: 1.4.0.dev1 | |
| 10 | 10 | Requires: |
| 11 | -Requires.private: gammalib >= 1.3.0 | |
| 11 | +Requires.private: gammalib >= 1.4.0.dev1 | |
| 12 | 12 | Conflicts: |
| 13 | 13 | Cflags: -I${includedir}/ctools @OPENMP_CXXFLAGS@ |
| 14 | 14 | Libs: -L${libdir} -lctools | ... | ... |
doc/Doxyfile
| ... | ... | @@ -32,7 +32,7 @@ PROJECT_NAME = ctools |
| 32 | 32 | # This could be handy for archiving the generated documentation or |
| 33 | 33 | # if some version control system is used. |
| 34 | 34 | |
| 35 | -PROJECT_NUMBER = 1.3.0 | |
| 35 | +PROJECT_NUMBER = 1.4.0.dev1 | |
| 36 | 36 | |
| 37 | 37 | # Using the PROJECT_BRIEF tag one can provide an optional one line description |
| 38 | 38 | # for a project that appears at the top of each page and should give viewer | ... | ... |
doc/source/conf.py
| ... | ... | @@ -66,10 +66,10 @@ copyright = u'2014-2017, ctools developers' |
| 66 | 66 | # built documents. |
| 67 | 67 | # |
| 68 | 68 | # The short X.Y version. |
| 69 | -version = '1.3' | |
| 69 | +version = '1.4' | |
| 70 | 70 | |
| 71 | 71 | # The full version, including alpha/beta/rc tags. |
| 72 | -release = '1.3.0' | |
| 72 | +release = '1.4.0.dev1' | |
| 73 | 73 | |
| 74 | 74 | # The language for content autogenerated by Sphinx. Refer to documentation |
| 75 | 75 | # for a list of supported languages. | ... | ... |
sonar-project.properties