diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-02-01 17:52:40 -0500 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-02-01 17:52:40 -0500 |
commit | 3d2773195c4d7ecd710ceda19612c1dc228fb1e0 (patch) | |
tree | e4c162cfc2728f59acc5d0a57ad0dc68f8d3ad8b | |
parent | a236a3ade7a59d6708fc1c59e88e94b6c6b59ce6 (diff) | |
parent | 860273101ff18c97d8d1e88e3946f113d549dfa8 (diff) | |
download | gem5-3d2773195c4d7ecd710ceda19612c1dc228fb1e0.tar.xz |
Merge zizzer:/bk/multiarch
into zeep.eecs.umich.edu:/z/saidi/work/m5.multiarch
--HG--
extra : convert_revision : 88b5214973ecc2f5c0428da21b65b09c767ae31d
-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) |