diff options
author | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 14:02:51 +0200 |
---|---|---|
committer | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 14:02:51 +0200 |
commit | e3078a5db9e092d78813180ce077789551929e4f (patch) | |
tree | fce2a4b5607c8dc796faececf71f78ae83effe4e /src/xmlpatterns/environment/qgenericdynamiccontext_p.h | |
parent | 3a801a667c7c78076fc4aa84e47432ddd4a382a5 (diff) | |
parent | db0ebfd97d14bf3c537957d9642ba014318f8418 (diff) |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/xmlpatterns/environment/qgenericdynamiccontext_p.h')
-rw-r--r-- | src/xmlpatterns/environment/qgenericdynamiccontext_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h index 4ac5d7eab..37f6f4b6a 100644 --- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -72,7 +72,7 @@ namespace QPatternist * a run and is always used. In addition, more contexts, such as * a Focus can be created. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class GenericDynamicContext : public StackContextBase<DynamicContext> { |