lighta@lighta-x64:~/Documents/Myscript/RO/Servs/rathena$ svn merge -c -16968 https://rathena.svn.sourceforge.net/svnroot/rathena/trunk
WARNING: gnome-keyring:: couldn't connect to: /tmp/keyring-KSPF9a/pkcs11: No such file or directory
--- Reverse-merging r16968 into '.':
U    src/test/test_spinlock.c
U    src/config/const.h
U    src/common/sql.c
U    src/common/utils.c
U    src/common/mutex.c
U    src/common/sql.h
U    src/common/utils.h
U    src/common/grfio.c
U    src/common/mutex.h
U    src/common/malloc.c
U    src/common/mempool.c
U    src/common/md5calc.c
U    src/common/grfio.h
U    src/common/malloc.h
U    src/common/mempool.h
U    src/common/md5calc.h
U    src/common/netbuffer.c
U    src/common/db.c
U    src/common/conf.c
U    src/common/netbuffer.h
U    src/common/spinlock.h
U    src/common/showmsg.c
U    src/common/core.c
U    src/common/ers.c
U    src/common/network.c
U    src/common/db.h
U    src/common/showmsg.h
U    src/common/core.h
U    src/common/network.h
U    src/common/ers.h
U    src/common/strlib.c
U    src/common/evdp.h
U    src/common/strlib.h
U    src/common/mapindex.c
U    src/common/cbasetypes.h
U    src/common/thread.c
U    src/common/raconf.c
U    src/common/nullpo.c
U    src/common/mapindex.h
U    src/common/des.c
U    src/common/thread.h
U    src/common/raconf.h
U    src/common/nullpo.h
U    src/common/des.h
U    src/common/random.c
U    src/common/timer.c
U    src/common/atomic.h
U    src/common/timer.h
U    src/common/socket.c
U    src/common/evdp_epoll.c
U    src/common/winapi.h
U    src/common/mmo.h
U    src/common/socket.h
U    src/login/ipban.h
U    src/login/loginlog.h
U    src/login/account.h
U    src/login/ipban_sql.c
U    src/login/login.c
U    src/login/loginlog_sql.c
U    src/login/account_sql.c
U    src/login/login.h
U    src/char/int_mercenary.c
U    src/char/int_homun.c
U    src/char/int_mail.h
U    src/char/int_pet.c
U    src/char/int_homun.h
U    src/char/int_party.c
U    src/char/int_quest.c
U    src/char/int_auction.c
Conflict discovered in 'src/char/char.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/char/char.c
U    src/char/int_storage.c
U    src/char/int_party.h
U    src/char/int_guild.c
U    src/char/int_elemental.c
U    src/char/inter.c
U    src/char/char.h
U    src/char/int_guild.h
U    src/char/int_storage.h
U    src/char/inter.h
U    src/char/int_mail.c
U    src/map/chrif.h
U    src/map/path.h
U    src/map/quest.c
Conflict discovered in 'src/map/atcommand.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/atcommand.c
Conflict discovered in 'src/map/script.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/script.c
U    src/map/elemental.c
U    src/map/quest.h
U    src/map/atcommand.h
U    src/map/script.h
U    src/map/elemental.h
Conflict discovered in 'src/map/battle.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/battle.c
Conflict discovered in 'src/map/skill.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/skill.c
Conflict discovered in 'src/map/unit.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/unit.c
U    src/map/battle.h
U    src/map/mapreg.h
U    src/map/searchstore.c
U    src/map/skill.h
U    src/map/unit.h
U    src/map/mercenary.c
U    src/map/searchstore.h
U    src/map/mercenary.h
U    src/map/vending.c
U    src/map/vending.h
U    src/map/storage.c
U    src/map/storage.h
U    src/map/buyingstore.c
Conflict discovered in 'src/map/mob.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/mob.c
Conflict discovered in 'src/map/clif.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/clif.c
U    src/map/date.c
U    src/map/buyingstore.h
U    src/map/chat.c
U    src/map/clif.h
U    src/map/mob.h
U    src/map/chat.h
U    src/map/pc_groups.c
U    src/map/homunculus.c
U    src/map/itemdb.c
U    src/map/guild.c
U    src/map/pc_groups.h
U    src/map/homunculus.h
U    src/map/itemdb.h
Conflict discovered in 'src/map/intif.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/intif.c
U    src/map/guild.h
U    src/map/intif.h
U    src/map/npc.c
Conflict discovered in 'src/map/status.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/status.c
U    src/map/npc.h
Conflict discovered in 'src/map/status.h'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/status.h
U    src/map/duel.c
U    src/map/battleground.c
U    src/map/duel.h
U    src/map/trade.c
U    src/map/battleground.h
U    src/map/party.c
Conflict discovered in 'src/map/pc.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/pc.c
U    src/map/trade.h
U    src/map/instance.c
U    src/map/party.h
Conflict discovered in 'src/map/pc.h'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/pc.h
U    src/map/instance.h
Conflict discovered in 'src/map/map.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/map.c
U    src/map/npc_chat.c
U    src/map/log.c
Conflict discovered in 'src/map/map.h'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
U    src/map/map.h
U    src/map/mail.c
U    src/map/log.h
U    src/map/mail.h
U    src/map/pet.c
U    src/map/mapreg_sql.c
U    src/map/chrif.c
U    src/map/path.c
U    src/map/pet.h
U    src/tool/mapcache.c
U    vcproj-12/mapcache.vcxproj.filters
U    vcproj-12/login-server_sql.vcxproj
U    vcproj-12/char-server_sql.vcxproj
U    vcproj-12/map-server_sql.vcxproj
U    vcproj-12/mapcache.vcxproj