repo.or.cz
/
EMFCompare2.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[434828] Test Merge Conflict Diff With Conflicting Diff With RequiredBy
2014-05-28
Arthur D
a
ussy
[434
8
28]
T
es
t
Merge Co
n
f
lict Dif
f
W
ith Conflicting
.
.
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-28
Arthur Daussy
[4348
2
2] Conflict be
t
ween move
and
d
elet
e
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-27
Arthur Daussy
Use w
i
dth hint in pr
e
ferenc
e
p
a
ges
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-27
Arth
u
r
Daussy
[4
3
2
0
3
3
]
Do
no
t
reset Gr
o
up
a
n
d
filter a
f
te
r
s
a
vi
n
g
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-23
Arthur Daussy
[435
3
65] CascadingFilter shouldn't
filter out chang
e
s
.
.
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-20
Ar
t
hur Daus
s
y
[
434827] Wrong ove
r
lay
i
co
n
a
f
ter mer
g
e
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-05-13
Arthur Daussy
[434714]
Add EMF Content ty
p
e to
model pro
v
i
d
er
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Add de
s
cription for "UML r
e
fined
e
lement" filter
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-10
Arth
u
r
Daussy
Add
a d
e
scripti
o
n to "Di
a
gram
Refi
n
e
d
elements"
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-10
Arthu
r
Daussy
A
dd d
e
sc
r
iptio
n
and label to "Diagram post p
r
oce
s
sor"
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-10
A
r
thur Dau
s
sy
Eng
i
nes preference page: Cor
r
ect message dialog
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-10
Arthur
D
au
s
sy
Groups a
n
d Filters preference page: Lines
up label
.
.
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-09
Ar
t
hur Dauss
y
[42
9
636] Documentation
u
pd
a
te: Groups
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-09
A
rt
h
ur Da
u
ssy
[430372] Docume
n
tation up
d
ate
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-09
Arthur Daussy
I
m
prov
e
s EMF Comp
a
re glo
b
al preference page
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-08
Arthur D
a
us
s
y
[
4
30682] New t
e
st
:
Test ModelR
e
so
l
verManager
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-08
Arthur
D
a
ussy
[43
0
682
]
User
Doc: Model resoluti
o
n
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-07
Arthur D
a
u
ssy
I
m
proves preference p
a
ge UI
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-07
Arthur Daussy
[430682] I
m
p
rov
e
s Mod
e
lResolverManager
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-03
Arthur
D
auss
y
Correct Helios co
m
patib
i
lty break
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-03
Arthur D
a
u
s
s
y
[429441] User doc up
d
ate: Post
p
rocessors
configuration
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-03
A
rthur Dauss
y
[431
7
85] Co
r
rect sync
h
ronizati
o
n mechanism
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-03
Arthu
r
Dau
s
sy
[427126] U
s
er doc
update: Engine
c
onf
i
guration
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-02
Ar
t
hu
r
Daussy
New tests:
T
est MatchEngi
n
eF
a
ctoryRegis
t
ryWra
p
p
er
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
Improvements an
d
correction
s
on MatchEngi
n
e
R
egistry
W
rapper
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
New te
s
ts: T
e
s
t Item
R
egis
t
ry
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-02
Ar
t
hur Daussy
[429636]
Add Gro
u
p S
y
nchronization behavior mecha
n
ism
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-02
A
r
t
hur
D
a
ussy
[430682]
Correction on
M
odelResolutionPreferencePage
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-02
Arthur Dauss
y
[430372] Add sync
h
ronization
b
e
ha
v
ior
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-04-01
Art
h
u
r Daussy
Imp
r
ovem
e
nts and corr
e
ctions on ItemRegistr
y
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-31
Arthur D
a
u
ssy
[429636]
Creat
e
pr
e
ference page for groups
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-31
Arth
u
r Daussy
[430682] Pr
e
fe
r
e
n
ce
p
age for Model
R
esolving mechanism
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-31
A
r
t
h
ur Daussy
[43068
2
] Refactor
i
n
g of IMo
d
elResolver
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-26
Arthur Daussy
[4
3
0372] Preference p
a
ge for filter
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-26
Arthu
r
Daussy
[430372] Re
f
act
o
r fil
t
ers
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daussy
Typo e
r
ror in develope
r
documentatio
n
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-24
Arthur
D
aussy
C
orrect
order on
p
o
st processors
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daus
s
y
Remove useless prefer
e
nce tab
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-19
Arthur Daus
s
y
[427126
]
Layout correction f
o
r Windows OS
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-17
A
rt
h
ur Daussy
T
y
po error in emfcomparercpu
i
messages
.
propertie
s
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-13
Art
h
u
r
Daussy
[429
6
36] R
e
factoring
o
f IDif
f
e
r
ence
G
roupProvider
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-13
Ar
t
hur
Daussy
[429441] Extend
UML Post proc
e
ss ui
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-13
Arthu
r
Daussy
[429441
]
Enable/
D
isable post p
r
ocessors
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-13
Art
h
ur
Daus
s
y
Prev
e
nt chan
g
i
ng group
t
wice for onl
y
one
s
election
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-10
Arthu
r
Dau
s
sy
Correc
t
t
yp
o
error on IM
P
L_CLASS_DESCRIPTOR_ATTR in
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-07
Arthur Daussy
Rem
o
ve Google
A
P
I leak
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-03-07
Arthur
Daussy
Fix @ si
n
ce
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-02-24
Arthur
Daussy
Name
r
efactoring
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-02-24
Ar
t
hur Daussy
[4271
2
6] A
d
d
m
a
tch engne UI
configuration
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-02-19
Arthur Daussy
[427126]
U
I refactoring
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-02-19
Arthur Dau
s
sy
[4
2
712
6
] Build c
o
rrec
t
ion
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-02-18
Arthur Daussy
[427126]
Add Match
engine ext
e
nsion p
o
int
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-02-18
A
r
thur Dauss
y
[427126]
New
e
xtension
points
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-02-14
A
r
t
hur Daussy
[426975] A
d
d color pre
f
erence
for EMF Compare
viewer
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-02-13
Art
h
ur Da
u
ssy
A
dd @noimplem
e
nt
and
@
noextend to
I
Ma
t
chEngine
.
F
a
ctory
.
.
.
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree
2014-02-13
A
r
t
hur
D
aussy
[427
1
26]
Add default constructor to DefaultDiff
E
ngine
Signed-off-by: Arthur Daussy <
arthur.daussy@obeo.fr
>
commit
|
commitdiff
|
tree