diff src/main.cpp @ 647:a03264984ef8

Merge

--- a/src/main.cpp	Fri Jan 11 10:29:36 2013 +0000
+++ b/src/main.cpp	Mon Jan 21 10:22:44 2013 +0000
@@ -5,8 +5,8 @@
 
     Based on HgExplorer by Jari Korhonen
     Copyright (c) 2010 Jari Korhonen
-    Copyright (c) 2012 Chris Cannam
-    Copyright (c) 2012 Queen Mary, University of London
+    Copyright (c) 2013 Chris Cannam
+    Copyright (c) 2013 Queen Mary, University of London
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -18,13 +18,33 @@
 #include "mainwindow.h"
 #include "common.h"
 #include "debug.h"
+#include "version.h"
 
 #include <QApplication>
 #include <QTranslator>
 #include <QDir>
 
+using std::cout;
+using std::endl;
+
 int main(int argc, char *argv[])
 {
+    if (argc == 2 &&
+        (!strcmp(argv[1], "-v") ||
+         !strcmp(argv[1], "--version"))) {
+        cout << "EasyMercurial v" << EASYHG_VERSION << "\n"
+             << "Copyright (c) 2010 Jari Korhonen\n"
+             << "Copyright (c) 2013 Chris Cannam\n"
+             << "Copyright (c) 2013 Queen Mary, University of London\n"
+             << "This program is free software; you can redistribute it and/or\n"
+             << "modify it under the terms of the GNU General Public License as\n"
+             << "published by the Free Software Foundation; either version 2 of the\n"
+             << "License, or (at your option) any later version.  See the file\n"
+             << "COPYING included with this distribution for more information."
+             << endl;
+        return 0;
+    }
+
     QApplication app(argc, argv);
 
     QApplication::setOrganizationName("easymercurial");