# HG changeset patch
# User Teemu Piippo <crimsondusk64@gmail.com>
# Date 1452354525 -7200
# Node ID 5900be70c619644adb212de263a318ce1230bdd7
# Parent  7b156b764d1189629f002029f636e21cac10b685# Parent  ca10837a2a9ee3cba6a9ccbaba421bfa4af3a9e6
Merged with default

diff -r 7b156b764d11 -r 5900be70c619 sources/mystring.cpp
diff -r 7b156b764d11 -r 5900be70c619 sources/mystring.h