Commit 4f9eab12 authored by nanahira's avatar nanahira

Merge branch 'master' of github.com:Fluorohydride/ygopro

parents 74e70bbc c1981237
# data files # data files
/beta /beta
/expansions /expansions
<<<<<<< HEAD
/specials /specials
=======
/fonts
/icon
/pack
/pics
/replay
/single
/WindBot
/cards.cdb
/error.log
/bot.conf
/Bot.exe
/bot
/ygopro
/ygopro.exe
/ygopro.app
/ikpMP3.dll
/irrKlang.dll
>>>>>>> c198123788d9d57e8cdf136e9c2b7dc7a3dcf588
# build files # build files
/bin /bin
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment