Merge remote-tracking branch 'origin/master' into neon
Conflicts: plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/Checker.java plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/CheckerManager.java plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/CheckersContainer.java Change-Id: I82322bd32ff90a6e98bc9d5f51609ec7fcf3856a
No related branches found
No related tags found
Showing
- org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target 8 additions, 0 deletions...s.chess.target.neon/org.polarsys.chess.target.neon.target
- plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/Checker.java 188 additions, 136 deletions.../polarsys/chess/checkers/core/checkerManager/Checker.java
- plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/CheckerManager.java 272 additions, 222 deletions...ys/chess/checkers/core/checkerManager/CheckerManager.java
- plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/CheckersContainer.java 101 additions, 72 deletions...chess/checkers/core/checkerManager/CheckersContainer.java
Please register or sign in to comment