diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-09 18:35:28 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-09 18:35:28 -0500 |
| commit | 872bbdfc33cb82bf32576db3a57d3055a04acbac (patch) | |
| tree | 837dd214bd682ac7efa515b18857bec7d4d35bef /util/emacs | |
| parent | 3adb45144aca819c9796168ecde7a263169d9d4d (diff) | |
| parent | 7b283dbc090d1197593b00fd1279b92f7c2e693e (diff) | |
| download | gem5-872bbdfc33cb82bf32576db3a57d3055a04acbac.tar.xz | |
Hand merge. Stuff probably doesn't compile.
--HG--
rename : arch/alpha/isa_desc => arch/alpha/isa/main.isa
rename : arch/alpha/alpha_linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/alpha_linux_process.hh => arch/alpha/linux/process.hh
rename : arch/alpha/alpha_tru64_process.cc => arch/alpha/tru64/process.cc
rename : arch/alpha/alpha_tru64_process.hh => arch/alpha/tru64/process.hh
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : 7d1efcedd708815d985a951f6f010fbd83dc27e8
Diffstat (limited to 'util/emacs')
| -rw-r--r-- | util/emacs/m5-c-style.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/emacs/m5-c-style.el b/util/emacs/m5-c-style.el index b9d16a4b1..9578e3dbe 100644 --- a/util/emacs/m5-c-style.el +++ b/util/emacs/m5-c-style.el @@ -1,4 +1,4 @@ -; Copyright (c) 2003-2004 The Regents of The University of Michigan +; Copyright (c) 2003-2004, 2006 The Regents of The University of Michigan ; All rights reserved. ; ; Redistribution and use in source and binary forms, with or without @@ -29,6 +29,7 @@ (c-add-style "m5" '((c-basic-offset . 4) + (indent-tabs-mode . nil) (c-offsets-alist . ((substatement-open . 0) (inline-open . 0) (block-open . -4) |