diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-09 12:15:32 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-09 12:15:32 -0500 |
| commit | 9b53650a455c235f5b15c6df42ab58f24582596d (patch) | |
| tree | 0c53059389f624750d411b959963fc339b2bd0ca /src/qt/bitcoingui.h | |
| parent | 7de7913abdbaa30f0ef6ad1b63508d3a8441d08f (diff) | |
| parent | 2d8bc0e6da2203ba2ae62bb167110529e5b6f7d4 (diff) | |
Merge branch '0.5.0.x' into 0.5.x
Conflicts:
contrib/debian/changelog
Diffstat (limited to 'src/qt/bitcoingui.h')
| -rw-r--r-- | src/qt/bitcoingui.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index ecb356dc35..a0905e44ad 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -82,6 +82,7 @@ private: QAction *exportAction; QAction *encryptWalletAction; QAction *changePassphraseAction; + QAction *aboutQtAction; QSystemTrayIcon *trayIcon; Notificator *notificator; |