diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-08-26 09:54:33 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-08-26 09:54:33 +0200 |
| commit | 87136163dcd7ffb8759875bca2b4e559a32167cd (patch) | |
| tree | 5c5467759ffdf69d5e62a052fb77fc64d5a54f45 /demos | |
| parent | 0c70be512bfc40e8a2a09f60a66b7ecb114e748e (diff) | |
| parent | 8f389d20bc01a355a6a1885b5bd1d30bd2ff0c71 (diff) | |
| download | qt4-tools-87136163dcd7ffb8759875bca2b4e559a32167cd.tar.gz | |
Merge remote-tracking branch 'mainline/4.8'
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/embedded/lightmaps/lightmaps.h | 2 | ||||
| -rw-r--r-- | demos/embedded/lightmaps/mapzoom.h | 2 | ||||
| -rw-r--r-- | demos/embedded/lightmaps/slippymap.h | 2 | ||||
| -rw-r--r-- | demos/mobile/guitartuner/src/guitartuner.rc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/demos/embedded/lightmaps/lightmaps.h b/demos/embedded/lightmaps/lightmaps.h index 45b5c188a2..0e458eacdd 100644 --- a/demos/embedded/lightmaps/lightmaps.h +++ b/demos/embedded/lightmaps/lightmaps.h @@ -85,4 +85,4 @@ private: bool invert; }; -#endif
\ No newline at end of file +#endif diff --git a/demos/embedded/lightmaps/mapzoom.h b/demos/embedded/lightmaps/mapzoom.h index ac70a23316..935660c9af 100644 --- a/demos/embedded/lightmaps/mapzoom.h +++ b/demos/embedded/lightmaps/mapzoom.h @@ -66,4 +66,4 @@ private: QNetworkSession *networkSession; }; -#endif
\ No newline at end of file +#endif diff --git a/demos/embedded/lightmaps/slippymap.h b/demos/embedded/lightmaps/slippymap.h index 64ba5c3e59..480dc81f30 100644 --- a/demos/embedded/lightmaps/slippymap.h +++ b/demos/embedded/lightmaps/slippymap.h @@ -84,4 +84,4 @@ private: QUrl m_url; }; -#endif
\ No newline at end of file +#endif diff --git a/demos/mobile/guitartuner/src/guitartuner.rc b/demos/mobile/guitartuner/src/guitartuner.rc index 85cee0b93c..b4f7a112ff 100644 --- a/demos/mobile/guitartuner/src/guitartuner.rc +++ b/demos/mobile/guitartuner/src/guitartuner.rc @@ -20,4 +20,4 @@ BEGIN BEGIN VALUE "Translation", 0x409, 1252 END -END
\ No newline at end of file +END |