Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation

This commit is contained in:
Milton Goncalves 2011-01-14 16:41:13 +00:00
commit 8ee980c25a
20 changed files with 242 additions and 65 deletions

View file

@ -58,6 +58,7 @@ HEADERS += src/abstractcounter.h \
src/tab_game.h \
src/tab_deck_storage.h \
src/tab_supervisor.h \
src/tab_admin.h \
src/userlist.h \
src/userinfobox.h \
src/remotedecklist_treewidget.h \
@ -139,6 +140,7 @@ SOURCES += src/abstractcounter.cpp \
src/tab_game.cpp \
src/tab_deck_storage.cpp \
src/tab_supervisor.cpp \
src/tab_admin.cpp \
src/userlist.cpp \
src/userinfobox.cpp \
src/remotedecklist_treewidget.cpp \