diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-07-08 11:17:37 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-07-08 11:17:37 (GMT) |
| commit | f037c0e87d186a01f07cb9aa360dcc496d11145e (patch) | |
| tree | 9449cc65b856b4743e933cf2b8ae1cb2f85ba9fd /doc/src/external-resources.qdoc | |
| parent | 5016de08d84c4d2887f7424dbf17f31e27c2e8e2 (diff) | |
| parent | 1dd26ea2486db87b61e8e9f70a1e04f7386405ef (diff) | |
| download | Qt-f037c0e87d186a01f07cb9aa360dcc496d11145e.zip Qt-f037c0e87d186a01f07cb9aa360dcc496d11145e.tar.gz Qt-f037c0e87d186a01f07cb9aa360dcc496d11145e.tar.bz2 | |
Merge remote branch 'upstream/4.8'
Conflicts:
doc/src/external-resources.qdoc
Diffstat (limited to 'doc/src/external-resources.qdoc')
| -rw-r--r-- | doc/src/external-resources.qdoc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 8b5d039..63e11c8 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -498,3 +498,8 @@ \externalpage http://www.rfc-editor.org/rfc/bcp/bcp47.txt \title RFC 5646 - BCP47 */ + +/*! + \externalpage http://www.developer.nokia.com/Community/Wiki/Graphics_memory_handling + \title Graphics Out Of Memory monitor +*/ |