Resolved CVS conflict

[wxWidgets.git] / include / wx / iconloc.h

diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h
index 262cfb4036ccd6d45866bd0d142d859d6f768a2b..dcccca3274f64ccbf1cc46ea1a9d41a45f838743 100644 (file)
--- a/include/wx/iconloc.h
+++ b/include/wx/iconloc.h
@@ -6,7 +6,7 @@
 // Created:     21.06.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICONLOC_H_