# HG changeset patch # User Sebastian Kruse # Date 1355147828 -3600 # Node ID 169bf48359e2184dabd1612b2358af9a76cfcccb # Parent e86fc5c5d3862680881a703af93272650bd4ef1e# Parent 5db587ba4b0f5dcbb826663cf134a52c2e2af805 Merge heads after hg histedit diff -r e86fc5c5d386 -r 169bf48359e2 src/econnect/wp3_3/client/widgets/table/DynamicStiTable.java