Mercurial > hg > easyhg

diff easyhg.qrc @ 531:f56e5c39aad1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start work on merge topic
author Chris Cannam
date Wed, 23 Nov 2011 17:03:43 +0000
parents 6bb2a1f3087c
children 1ff2a1bf0a40
line wrap: on
line diff
--- a/easyhg.qrc	Wed Nov 23 11:24:23 2011 +0000
+++ b/easyhg.qrc	Wed Nov 23 17:03:43 2011 +0000
@@ -42,9 +42,12 @@
 	<file>help/a-31.html</file>
 	<file>help/a-32.html</file>
 	<file>help/a-33.html</file>
+	<file>help/a-34.html</file>
+	<file>help/a-40.html</file>
 	<file>help/images/openremote50.png</file>
 	<file>help/images/openfolder50.png</file>
 	<file>help/images/openlocal50.png</file>
+	<file>help/images/merge50.png</file>
 	<file>easyhg.py</file>
 	<file>easyhg_en.qm</file>
     </qresource>