From e3c65721d3bc607d786a8a1d0a7c8f7397de7570 Mon Sep 17 00:00:00 2001 From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr> Date: Fri, 26 Feb 2016 16:41:03 +0000 Subject: [PATCH] Snapshot version in trunk --- pom.xml | 10 +++++----- src/cbproj/Novelec.layout | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index b7575e5..b068c70 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ </parent> <groupId>fr.soleil.device</groupId> <artifactId>MCCE2Electrometers-${aol}-${mode}</artifactId> - <version>2.2.8</version> + <version>2.2.9-SNAPSHOT</version> <packaging>nar</packaging> <name>MCCE2Electrometers</name> <!-- use for the name of executable --> @@ -27,10 +27,10 @@ <artifactId>Electrometers-${aol}-${library}-${mode}</artifactId> <!-- <version>2.5.19</version> --> </dependency> - <dependency> - <groupId>fr.soleil.lib</groupId> - <artifactId>YAT4Tango-${aol}-${library}-${mode}</artifactId> - </dependency> + <dependency> + <groupId>fr.soleil.lib</groupId> + <artifactId>YAT4Tango-${aol}-${library}-${mode}</artifactId> + </dependency> </dependencies> <scm> <connection>${scm.connection.svn.tango-ds}/DeviceClasses/MeasureInstruments/MCCE/NovelecElectrometer/trunk</connection> diff --git a/src/cbproj/Novelec.layout b/src/cbproj/Novelec.layout index fbeda0b..1c2f9ff 100644 --- a/src/cbproj/Novelec.layout +++ b/src/cbproj/Novelec.layout @@ -6,9 +6,9 @@ <Cursor1 position="628" topLine="24" /> </Cursor> </File> - <File name="..\MCCE2Electrometers.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> + <File name="..\MCCE2ElectrometersStateMachine.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <Cursor> - <Cursor1 position="0" topLine="0" /> + <Cursor1 position="0" topLine="51" /> </Cursor> </File> <File name="..\MCCE2ElectrometersClass.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> @@ -16,19 +16,19 @@ <Cursor1 position="0" topLine="59" /> </Cursor> </File> - <File name="..\MCCE2Electrometers.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> + <File name="..\MCCE2Electrometers.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <Cursor> - <Cursor1 position="924" topLine="0" /> + <Cursor1 position="11272" topLine="423" /> </Cursor> </File> - <File name="..\MCCE2ElectrometersStateMachine.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> + <File name="..\MCCE2Electrometers.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <Cursor> - <Cursor1 position="0" topLine="51" /> + <Cursor1 position="91655" topLine="2589" /> </Cursor> </File> - <File name="..\..\pom.xml" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> + <File name="..\..\pom.xml" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <Cursor> - <Cursor1 position="1081" topLine="0" /> + <Cursor1 position="541" topLine="0" /> </Cursor> </File> </CodeBlocks_layout_file> -- GitLab