diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-25 00:05:08 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-25 00:05:08 -0500 |
| commit | 1a7ce50a6c91af97291aa727483030a14a58859f (patch) | |
| tree | 983477557f8eb87a47341c8956a57c2b0ed4385b /vpx_ports/mem_ops_aligned.h | |
| parent | f8d4a81af20705c4a023689e9c347f079ffe02e5 (diff) | |
| parent | 861175ef001e5211ad9e60221e04da7fd1970d31 (diff) | |
| download | libvpx-1a7ce50a6c91af97291aa727483030a14a58859f.tar libvpx-1a7ce50a6c91af97291aa727483030a14a58859f.tar.gz libvpx-1a7ce50a6c91af97291aa727483030a14a58859f.tar.bz2 libvpx-1a7ce50a6c91af97291aa727483030a14a58859f.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I52f21ff6f9a1dca7099a8459657f6f288c5bfe40
Diffstat (limited to 'vpx_ports/mem_ops_aligned.h')
| -rw-r--r-- | vpx_ports/mem_ops_aligned.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vpx_ports/mem_ops_aligned.h b/vpx_ports/mem_ops_aligned.h index 4c44aa260..82a18b2e0 100644 --- a/vpx_ports/mem_ops_aligned.h +++ b/vpx_ports/mem_ops_aligned.h @@ -9,12 +9,12 @@ */ -/* \file mem_ops_aligned.h - * \brief Provides portable memory access primatives for operating on aligned +/* \file + * \brief Provides portable memory access primitives for operating on aligned * data * - * This file is split from mem_ops.h for easier maintainence. See mem_ops.h - * for a more detailed description of these primatives. + * This file is split from mem_ops.h for easier maintenance. See mem_ops.h + * for a more detailed description of these primitives. */ #ifndef INCLUDED_BY_MEM_OPS_H #error Include mem_ops.h, not mem_ops_aligned.h directly. |