jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 03:28:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt

Browse source 
Conflicts:
	cockatrice/src/dlg_settings.cpp
	cockatrice/src/dlg_settings.h
This commit is contained in:
Fabio Bas 2015-01-05 22:46:12 +01:00
commit 2101ed7096
47 changed files with 12148 additions and 5727 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/window_main.cpp
View file

@ -224,6 +224,7 @@ void MainWindow::actAbout()
+ tr("Portugese (Brazil):") + " Thiago Queiroz<br>"
+ tr("French:") + " Yannick Hammer, Arnaud Faes<br>"
+ tr("Japanese:") + " Nagase Task<br>"
+ tr("Korean:") + " Jaeic Lee<br>"
+ tr("Russian:") + " Alexander Davidov<br>"
+ tr("Italian:") + " Luigi Sciolla<br>"
+ tr("Swedish:") + " Jessica Dahl<br>"
@ -411,7 +412,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
}
event->accept();
settingsCache->setMainWindowGeometry(saveGeometry());
delete tabSupervisor;
tabSupervisor->deleteLater();
}
void MainWindow::changeEvent(QEvent *event)