diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 16:05:35 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 16:05:35 -0600 |
commit | 95565916b0f9bc46521bead9ae148f73e6beda61 (patch) | |
tree | c0f4155d24e6f18c33ab23d92b34a5ec64bfc16c /avmedia/inc/avmedia/mediawindow.hxx | |
parent | f327d71f9cc07c3a4e384d73d6023792a5151e7a (diff) |
merge trivial non-conflicting changes to avmedia
Diffstat (limited to 'avmedia/inc/avmedia/mediawindow.hxx')
-rw-r--r-- | avmedia/inc/avmedia/mediawindow.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx index 8643318631..62b998b2e1 100644 --- a/avmedia/inc/avmedia/mediawindow.hxx +++ b/avmedia/inc/avmedia/mediawindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -168,3 +169,5 @@ namespace avmedia } #endif // _AVMEDIA_MEDIAWINDOW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |