diff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-18 22:09:38 (GMT) | 
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-18 22:09:38 (GMT) | 
| commit | a23b90319f9de8db0b455f5cd56e2428a3fcc53b (patch) | |
| tree | 95d5baed116136cc214d8e1b5c49136b4abded5f /Swift/QtUI/QtSwift.cpp | |
| parent | ce4eb88be2eba12d5580bb22b48af3a0e915363b (diff) | |
| parent | 5b88d16b2ea7edfbc1487751fb95f128b2c30330 (diff) | |
| download | swift-contrib-a23b90319f9de8db0b455f5cd56e2428a3fcc53b.zip swift-contrib-a23b90319f9de8db0b455f5cd56e2428a3fcc53b.tar.bz2  | |
Merge branch 'swift-1.x'
* swift-1.x:
  Fixed Debian manpages installation.
  Use LibXML as a Debian source dependency (instead of Expat)
  Tweak help documentation and add manpages.
Conflicts:
	Swift/QtUI/QtSwift.cpp
Diffstat (limited to 'Swift/QtUI/QtSwift.cpp')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 13 | 
1 files changed, 7 insertions, 6 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index f0c876c..1d820b1 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -67,12 +67,13 @@ po::options_description QtSwift::getOptionsDescription() {  	po::options_description result("Options");  	result.add_options()  		("debug", "Turn on debug logging") -		("help", "produce help message") -		("netbook-mode", "use netbook mode display (unsupported)") -		("no-tabs", "don't manage chat windows in tabs (unsupported)") -		("latency-debug", "use latency debugging (unsupported)") -		("multi-account", po::value<int>()->default_value(1), "number of accounts to open windows for (unsupported)") -		("start-minimized", "don't show the login/roster window at startup") +		("help", "Show this help message") +		("version", "Show version information") +		("netbook-mode", "Use netbook mode display (unsupported)") +		("no-tabs", "Don't manage chat windows in tabs (unsupported)") +		("latency-debug", "Use latency debugging (unsupported)") +		("multi-account", po::value<int>()->default_value(1), "Number of accounts to open windows for (unsupported)") +		("start-minimized", "Don't show the login/roster window at startup")  		("eagle-mode", "Settings more suitable for military/secure deployments")  		;  	return result;  | 
 Swift