diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-19 03:19:32 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-19 03:19:32 (GMT) |
| commit | 9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d (patch) | |
| tree | 22f60abbc45a5ef8e1beab0af8d9980134d914ad /demos/browser/data/defaultbookmarks.xbel | |
| parent | f792bae5b13ad68f846a2be1f002d8376f2daef8 (diff) | |
| parent | af98f27a847688e53ab1d34b4a9c04bdc63fe3e1 (diff) | |
| download | Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.zip Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.tar.gz Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
doc/src/index.qdoc
doc/src/topics.qdoc
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
tests/auto/auto.pro
Diffstat (limited to 'demos/browser/data/defaultbookmarks.xbel')
| -rw-r--r-- | demos/browser/data/defaultbookmarks.xbel | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/demos/browser/data/defaultbookmarks.xbel b/demos/browser/data/defaultbookmarks.xbel index 1d20ac0..dce5297 100644 --- a/demos/browser/data/defaultbookmarks.xbel +++ b/demos/browser/data/defaultbookmarks.xbel @@ -30,6 +30,9 @@ <bookmark href="http://xkcd.com/"> <title>xkcd</title> </bookmark> + <bookmark href="http://twitter.com/qtbynokia"> + <title>Twitter</title> + </bookmark> </folder> <folder folded="yes"> <title>Bookmarks Menu</title> |