Skip to content

Commit

Permalink
update docs for 2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mdavidsaver committed Oct 24, 2016
1 parent 6086f8c commit 4f7ebc8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
4 changes: 2 additions & 2 deletions documentation/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ PROJECT_NAME = mrfioc2
# This could be handy for archiving the generated documentation or
# if some version control system is used.

PROJECT_NUMBER = 2.0.4
PROJECT_NUMBER = 2.1.0

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Expand Down Expand Up @@ -604,7 +604,7 @@ INPUT = ../mrfCommon \
# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
# the list of possible encodings.

INPUT_ENCODING = ISO-8859-1
INPUT_ENCODING = UTF-8

# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
Expand Down
14 changes: 12 additions & 2 deletions documentation/mainpage.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ For the generator see mrmEvgSetupVME() or the ::evgMrm class.
@section changelog Changelog
@subsection v210 2.1.0 (UNRELEASED)
@subsection v210 2.1.0 (Oct. 2016)
@subsubsection v210change Incompatible changes
Expand Down Expand Up @@ -210,7 +210,17 @@ For the generator see mrmEvgSetupVME() or the ::evgMrm class.
@author Jayesh Shah <jshah@bnl.gov>
@author Eric Bj�rklund <bjorklund@lanl.gov>
@author Eric Björklund <bjorklund@lanl.gov>
@author Slejko Tom <tom.slejko@psi.ch>
@author Helge Brands <helge.brands@psi.ch>
@author Saso Skube <saso.skube@psi.ch>
@author Jure Krasna <jure.krasna@cosylab.com>
@author Dirk Zimoch <dirk.zimoch@psi.ch>
*/

Expand Down
2 changes: 1 addition & 1 deletion mrfCommon/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ USR_CPPFLAGS += -DDEBUG_PRINT

export PERL5LIB=$(EPICS_BASE)/lib/perl

MRF_VERSION = 2.0.4
MRF_VERSION = 2.1.0

#---------------------
# Install include files
Expand Down

0 comments on commit 4f7ebc8

Please sign in to comment.