[tango] 08/21: Merge branch 'upstream'
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Jan 15 15:59:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository tango.
commit da0d2adf7359644fbcb8ae21ca2ce2a0e1d5f62e
Merge: d6947a9 ebbe170
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Thu Jul 9 09:29:07 2015 +0200
Merge branch 'upstream'
Makefile.am | 22 +-
Makefile.in | 23 +-
README | 2 +-
configure | 99 +-
configure.ac | 25 +-
cppserver/AbstractClass/AccessControl/Makefile.am | 3 +-
cppserver/AbstractClass/AccessControl/Makefile.in | 4 +-
cppserver/AbstractClass/Makefile.in | 1 +
cppserver/Makefile.in | 1 +
cppserver/database/DataBase.cpp | 210 +-
cppserver/database/DataBase.h | 27 +-
cppserver/database/DataBaseUtils.cpp | 8 +-
cppserver/database/Makefile.am | 53 +-
cppserver/database/Makefile.in | 46 +-
cppserver/database/update_db.sql.in | 11 +-
cppserver/database/update_db7.sql.in | 116 +-
cppserver/starter/Makefile.am | 3 +-
cppserver/starter/Makefile.in | 4 +-
cppserver/tangoaccesscontrol/Makefile.am | 3 +-
cppserver/tangoaccesscontrol/Makefile.in | 4 +-
cppserver/tangotest/Makefile.am | 3 +-
cppserver/tangotest/Makefile.in | 4 +-
doc/Makefile.in | 1 +
doc/man/Makefile.in | 1 +
doc/src/Makefile.am | 4 +-
doc/src/Makefile.in | 255 +-
doc/src/advanced/Makefile.am | 15 +
doc/src/{ => advanced}/Makefile.in | 24 +-
doc/src/advanced/alarm.eps | 66 +-
doc/src/advanced/alarm.fig | 67 +
doc/src/appendix/appendix.lyx | 8 +-
doc/src/dance/Makefile.am | 15 +
doc/src/{ => dance}/Makefile.in | 24 +-
doc/src/dance/Ready.eps | 53 +-
doc/src/dance/Ready.fig | 12 +
doc/src/ds_model/Makefile.am | 15 +
doc/src/{ => ds_model}/Makefile.in | 24 +-
doc/src/ds_model/event_schematic_zmq.eps | 32 +-
.../{zmq_event.fig => event_schematic_zmq.fig} | 0
doc/src/ds_writing/Makefile.am | 22 +
doc/src/{ => ds_writing}/Makefile.in | 31 +-
doc/src/ds_writing/command.eps | 200 +-
doc/src/ds_writing/complete_server.eps | 137 +-
doc/src/ds_writing/complete_server.fig | 75 +
doc/src/ds_writing/device_et.eps | 88 +-
doc/src/ds_writing/device_et.fig | 289 +
doc/src/ds_writing/ds_writing.lyx | 4 +-
doc/src/ds_writing/r_attribute.eps | 72 +-
doc/src/ds_writing/r_pipe.eps | 22 +-
doc/src/ds_writing/startup.eps | 286 +-
doc/src/ds_writing/startup.fig | 147 +
doc/src/ds_writing/w_attribute.eps | 24 +-
doc/src/ds_writing/w_attribute.fig | 104 +
doc/src/ds_writing/w_pipe.eps | 22 +-
doc/src/gen_api/Makefile.am | 15 +
doc/src/{ => gen_api}/Makefile.in | 24 +-
doc/src/gen_api/pipe.eps | 48 +-
doc/src/java_api/Makefile.am | 1 +
{utils => doc/src/java_api}/Makefile.in | 9 +-
doc/src/java_api/picture/Makefile.am | 16 +
doc/src/{ => java_api/picture}/Makefile.in | 25 +-
doc/src/java_api/picture/NewLine.eps | 54 +-
doc/src/java_api/picture/architecture.fig | 229 +
doc/src/java_api/picture/architerture.eps | 0
lib/Makefile.in | 1 +
lib/cpp/Makefile.am | 2 +-
lib/cpp/Makefile.in | 3 +-
lib/cpp/client/Makefile.am | 142 +-
lib/cpp/client/Makefile.in | 275 +-
lib/cpp/client/helpers/Makefile.am | 8 +-
lib/cpp/client/helpers/Makefile.in | 9 +-
lib/cpp/server/Makefile.am | 289 +-
lib/cpp/server/Makefile.in | 450 +-
lib/cpp/server/attrgetsetprop.cpp | 48 +-
lib/cpp/server/device.cpp | 6 +-
lib/cpp/server/dintrthread.cpp | 14 +-
lib/cpp/server/idl/Makefile.am | 59 +-
lib/cpp/server/idl/Makefile.in | 252 +-
lib/cpp/server/idl/tango.h | 7441 -------------------
lib/cpp/server/jpeg/Makefile.am | 29 +-
lib/cpp/server/jpeg/Makefile.in | 28 +-
lib/cpp/server/jpeg_mmx/Makefile.am | 17 +-
lib/cpp/server/jpeg_mmx/Makefile.in | 14 +-
lib/cpp/server/tangoDynSK.cpp | 6706 -----------------
lib/cpp/server/tangoSK.cpp | 7543 --------------------
lib/idl/Makefile.in | 1 +
lib/java/Makefile.in | 1 +
pogo/Makefile.in | 1 +
pogo/preferences/Makefile.in | 1 +
pogo/templates/Makefile.in | 1 +
scripts/Makefile.in | 1 +
utils/Makefile.in | 1 +
utils/tango_admin/Makefile.am | 3 +-
utils/tango_admin/Makefile.in | 4 +-
94 files changed, 3467 insertions(+), 23115 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git
More information about the debian-science-commits
mailing list