Skip to content
GitLab
  1. 06 Sep, 2016 1 commit
  3. 02 Sep, 2016 1 commit
  5. 12 Aug, 2016 1 commit
  7. 28 Jul, 2016 1 commit
  9. 27 Jul, 2016 1 commit
  11. 26 Jul, 2016 1 commit
  13. 03 Jun, 2015 1 commit
  15. 18 Nov, 2014 2 commits
    • berge's avatar
      Merged branches/Security/javasrc (r1425-1803) to trunk. · 4a7a5d77
      berge authored 
      This completes cleaning operation of r1821 by re-inserting non-STF455 specific changes in trunk
      4a7a5d77
    • berge's avatar
      /!\ FIXING BRANCH/MERGE ISSUES /!\ · 7c515cdb
      berge authored 
      Reverting non STF455-specific changes trunk/javasrc (r1427 - r1432). 
Those changes:
 - have been manually duplicated in Security branch, causing massive conflicts upon merging the branch back in trunk. 
 - will be re-inserted by merging Security branch back in trunk (cf. next commit)
      7c515cdb
  17. 03 Jun, 2014 1 commit
  19. 22 May, 2014 1 commit