diff options
| author | pacien | 2018-02-04 22:30:21 +0100 |
|---|---|---|
| committer | pacien | 2018-02-04 22:30:21 +0100 |
| commit | 276753488bf2e6670bdd77d59042ed168e807a40 (patch) | |
| tree | a9ea2bfbf1bd81f0c94bfbb6a2936a0a79a6653e /build.xml | |
| parent | 652db1608644b790489ffd4295a63a340364b88f (diff) | |
| parent | e9e931b0e098bc4c97ea0be400683408150a4028 (diff) | |
| download | wallj-276753488bf2e6670bdd77d59042ed168e807a40.tar.gz | |
Merge branch 'master' of https://github.com/pacien/upem-java-wallj
Signed-off-by: pacien <pacien.trangirard@pacien.net>
# Conflicts:
# src/main/java/fr/umlv/java/wallj/viewer/ScreenManager.java
Diffstat (limited to 'build.xml')
0 files changed, 0 insertions, 0 deletions