From: Vincent Date: Fri, 16 Dec 2022 16:40:10 +0000 (+0100) Subject: wait #5652 @0.75 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7a4f7870ec42f00c0441d5ee15e44930aaa47060;p=cubedesigners-oxygene.git wait #5652 @0.75 Merge remote-tracking branch 'remotes/origin/before-dsn' # Conflicts: # PAIE/CUBE.$SO/DSN/DSN20221210_CNS_07.DSN # PAIE/CUBE.$SO/NUMEROS.$D1 # PAIE/CUBE.$SO/NUMEROS.B00 # PAIE/CUBE.$SO/PA_ASSEDIC.$D1 # PAIE/CUBE.$SO/PA_DS_E_R.$D1 # PAIE/CUBE.$SO/PA_DS_E_R.B01 # PAIE/CUBE.$SO/PA_DS_E_R.B0a # PAIE/CUBE.$SO/PA_DS_E_R.H00 # PAIE/CUBE.$SO/PA_DS_E_S.$D1 # PAIE/CUBE.$SO/PA_DS_E_S.B01 # PAIE/CUBE.$SO/PA_DS_E_S.B02 # PAIE/CUBE.$SO/PA_DS_E_S.B05 # PAIE/CUBE.$SO/PA_DS_E_S.B06 # PAIE/CUBE.$SO/PA_DS_E_S.B18 # PAIE/CUBE.$SO/PA_DS_E_S.H00 # systeme/$$-PREF.$D1 # systeme/CONNEXION.$D1 # systeme/COURS.$D1 # systeme/COURS.B01 # systeme/COURS.B02 # systeme/COURS.B06 # systeme/NUMCOURS.$D1 # systeme/SYSNUMS.$D1 # systeme/licences/suscribe.data --- 7a4f7870ec42f00c0441d5ee15e44930aaa47060 diff --cc PAIE/CUBE.$SO/BulletinsPDF/202212/CNS 202212.pdf index 460c397b,460c397b..65c4686c Binary files differ diff --cc PAIE/CUBE.$SO/BulletinsPDF/202212/DEY 202212.pdf index 00000000,00000000..347fd61d new file mode 100644 Binary files differ diff --cc PAIE/CUBE.$SO/BulletinsPDF/202212/ETL 202212.pdf index 00000000,00000000..85094d10 new file mode 100644 Binary files differ diff --cc PAIE/CUBE.$SO/BulletinsPDF/202212/STM 202212.pdf index 00000000,00000000..b8f52acf new file mode 100644 Binary files differ diff --cc PAIE/CUBE.$SO/BulletinsPDF/202212/VLV 202212.pdf index 00000000,00000000..7318cf29 new file mode 100644 Binary files differ diff --cc PAIE/CUBE.$SO/DSN/DSN20221210_CNS_07.DSN index f0fc0c07,05091b06..c4bd777b --- a/PAIE/CUBE.$SO/DSN/DSN20221210_CNS_07.DSN +++ b/PAIE/CUBE.$SO/DSN/DSN20221210_CNS_07.DSN @@@ -17,7 -17,7 +17,11 @@@ S10.G00.02.005,'0144241853 S20.G00.05.001,'07' S20.G00.05.002,'01' S20.G00.05.003,'11' ++<<<<<<< HEAD +S20.G00.05.004,'20221206094458' ++======= + S20.G00.05.004,'20221206095906' ++>>>>>>> remotes/origin/before-dsn S20.G00.05.007,'06122022' S20.G00.05.009,'00000003' S20.G00.05.010,'01' diff --cc PAIE/CUBE.$SO/NUMEROS.$D1 index 92fa3dc7,71f34a44..0ac361bb Binary files differ diff --cc PAIE/CUBE.$SO/PA_ABSEN.$D1 index 2c36bbbf,2c36bbbf..6bd98263 Binary files differ diff --cc PAIE/CUBE.$SO/PA_ABSEN.B01 index f065048d,f065048d..1f3b8dca Binary files differ diff --cc PAIE/CUBE.$SO/PA_ABSEN.B0d index d492cc10,d492cc10..284d9b1c Binary files differ diff --cc PAIE/CUBE.$SO/PA_ABSEN.B0e index 50107935,50107935..1e308247 Binary files differ diff --cc PAIE/CUBE.$SO/PA_ABSEN.H00 index 13fe28dd,13fe28dd..d7c53535 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BULLE.$D1 index eabc810f,eabc810f..79225d60 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BULLE.B01 index 253bbb61,253bbb61..4087a644 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BULLE.B27 index c611b4bc,c611b4bc..c60be13f Binary files differ diff --cc PAIE/CUBE.$SO/PA_BULLE.B28 index 2cd4d7c4,2cd4d7c4..4c3b4603 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BULLE.B29 index 0c0c3ecb,0c0c3ecb..fd59493f Binary files differ diff --cc PAIE/CUBE.$SO/PA_BULLE.B2a index 2ae8ff93,2ae8ff93..03a814c7 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BULLE.B2b index 7a02601c,7a02601c..fe401515 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BULLE.B2c index c991f981,c991f981..9acdbdac Binary files differ diff --cc PAIE/CUBE.$SO/PA_BULLE.B2d index b2f4c7d3,b2f4c7d3..b4bfa1f0 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BULLE.H00 index 272e3cb1,272e3cb1..7f395919 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BUL_R.$D1 index 152b60cb,152b60cb..e65251d4 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BUL_R.B00 index 23680b69,23680b69..100e7594 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BUL_R.B0d index af175f6b,af175f6b..1f45b151 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BUL_R.B0e index b45cedf8,b45cedf8..71d6690f Binary files differ diff --cc PAIE/CUBE.$SO/PA_BUL_R.B0f index ab682753,ab682753..053f1f2f Binary files differ diff --cc PAIE/CUBE.$SO/PA_BUL_R.B10 index b0f253e3,b0f253e3..530150a7 Binary files differ diff --cc PAIE/CUBE.$SO/PA_BUL_R.B11 index c8fafda8,c8fafda8..b28de78d Binary files differ diff --cc PAIE/CUBE.$SO/PA_BUL_R.B12 index c648fae2,c648fae2..727a4302 Binary files differ diff --cc PAIE/CUBE.$SO/PA_EPERE.$D1 index bff5f81c,bff5f81c..42b64a8c Binary files differ diff --cc PAIE/CUBE.$SO/PA_EPERE.B01 index b413f948,b413f948..ae2b7e6b Binary files differ diff --cc PAIE/CUBE.$SO/PA_EPERE.B06 index db200f17,db200f17..f3cc2390 Binary files differ diff --cc PAIE/CUBE.$SO/PA_EPERE.H00 index 7da4dcae,7da4dcae..db9065ea Binary files differ diff --cc PAIE/CUBE.$SO/PA_EPERE.H02 index a241dc2e,a241dc2e..c7dbf249 Binary files differ diff --cc PAIE/CUBE.$SO/PA_EVAR_E.$D1 index 723980be,723980be..c01aa49e Binary files differ diff --cc PAIE/CUBE.$SO/PA_EVAR_L.$D1 index ba0c3adb,ba0c3adb..1b032a68 Binary files differ diff --cc PAIE/CUBE.$SO/PA_EVAR_L.B00 index 46411f9d,46411f9d..8422c8c7 Binary files differ diff --cc PAIE/CUBE.$SO/PA_EVAR_L.B04 index 8c382ddd,8c382ddd..edbce603 Binary files differ diff --cc PAIE/CUBE.$SO/PA_SALARH.$D1 index d8df7a67,d8df7a67..6a084e03 Binary files differ diff --cc PAIE/CUBE.$SO/PA_SALARH.B00 index af038bb2,af038bb2..19036ee2 Binary files differ diff --cc PAIE/CUBE.$SO/PA_SALARH.B01 index fd590fd0,fd590fd0..efb0cccc Binary files differ diff --cc PAIE/CUBE.$SO/PA_SALARH.B03 index 6229ede1,6229ede1..68958087 Binary files differ diff --cc PAIE/CUBE.$SO/PA_SALARH.B04 index 291f4deb,291f4deb..c3bc3c59 Binary files differ diff --cc PAIE/CUBE.$SO/TRACE_EVENT.$D1 index e074fd62,e074fd62..afd944be Binary files differ diff --cc PAIE/CUBE.$SO/TRACE_EVENT.B01 index 6f005469,6f005469..84b517e6 Binary files differ diff --cc PAIE/CUBE.$SO/TRACE_EVENT.H00 index 10d4fa37,10d4fa37..a3984cd7 Binary files differ diff --cc systeme/$$-PREF.$D1 index 6dd81cc1,d6a83b00..ddd3a62a Binary files differ diff --cc systeme/CONNEXION.$D1 index 0d042ed8,481eeecd..71e2d900 Binary files differ diff --cc systeme/COURS.$D1 index 5cc6280c,53c95630..c241e2aa Binary files differ diff --cc systeme/COURS.B01 index 09d3b37c,283cf35d..8b0c09d6 Binary files differ diff --cc systeme/COURS.B02 index 504b230b,6f90ae5c..ba595b8f Binary files differ diff --cc systeme/COURS.B06 index 610c0fb3,8a801a0d..afdf3344 Binary files differ diff --cc systeme/SYSNUMS.$D1 index 792b7063,81dacf5a..7af9452c Binary files differ diff --cc systeme/licences/suscribe.data index 6ad57144,dff021d1..819b4abd --- a/systeme/licences/suscribe.data +++ b/systeme/licences/suscribe.data @@@ -1,5 -1,5 +1,10 @@@ [status] - 93130=7D815F160436713C3FCCAA45206BB7CA594905EFEFD3F7AB49C002E11C8C783CF38CDE0ACB966324 - 130=315A4E6E18FDA98C4F6EB65560CDA22A77B22544881DA0F6C7F17330CB9DA8177D2E836AAC74739A ++<<<<<<< HEAD ++93130=7D815F160436713C0FC43C33E823A67E977DC3E5E78A5F1335B3F97F01546B96F38CDE0ACB966324 ++130=315A4E6E18FDA98C4F6EB65560CDA22A9EDEA5A119871226C7F17330CB9DA817F38CDE0ACB966324 ++======= + 93130=7D815F160436713C0FC43C33E823A67E977DC3E5E78A5F1335B3F97F01546B9678D40DF6A7AACB6B + 130=315A4E6E18FDA98C4F6EB65560CDA22A9EDEA5A119871226C7F17330CB9DA81778D40DF6A7AACB6B ++>>>>>>> remotes/origin/before-dsn [settings] dbdata=77C6866E472057B0A1F73018FE8956CE