summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordknn <yoann.blein@free.fr>2012-09-22 09:46:25 (GMT)
committerdknn <yoann.blein@free.fr>2012-09-22 09:46:25 (GMT)
commit47aac30247840a3b7aad2772ad0dee60b2b17b3a (patch)
tree9f0133e0982a583767c51e490f15ae135c2e0766 /Swift/Controllers/UIInterfaces/UIFactory.h
parentced4cbf27545620b2a9be59173fd87305cab4a8b (diff)
downloadswift-contrib-47aac30247840a3b7aad2772ad0dee60b2b17b3a.zip
swift-contrib-47aac30247840a3b7aad2772ad0dee60b2b17b3a.tar.bz2
Fix rebase mistakesdknn/rtp
Diffstat (limited to 'Swift/Controllers/UIInterfaces/UIFactory.h')
-rw-r--r--Swift/Controllers/UIInterfaces/UIFactory.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Swift/Controllers/UIInterfaces/UIFactory.h b/Swift/Controllers/UIInterfaces/UIFactory.h
index e0e5425..9e96f9f 100644
--- a/Swift/Controllers/UIInterfaces/UIFactory.h
+++ b/Swift/Controllers/UIInterfaces/UIFactory.h
@@ -39,7 +39,8 @@ namespace Swift {
public AdHocCommandWindowFactory,
public FileTransferListWidgetFactory,
public WhiteboardWindowFactory,
- public RemoteScreenWindowFactory {
+ public RemoteScreenWindowFactory,
+ public HistoryWindowFactory {
public:
virtual ~UIFactory() {}
};