Merge branch 'master' of git.darkou.fr:dbroqua/home
This commit is contained in:
commit
59322b8847
1 changed files with 20 additions and 0 deletions
|
@ -1,7 +1,13 @@
|
||||||
# Beware! This file is rewritten by htop when settings are changed in the interface.
|
# Beware! This file is rewritten by htop when settings are changed in the interface.
|
||||||
# The parser is also very primitive, and not human-friendly.
|
# The parser is also very primitive, and not human-friendly.
|
||||||
|
htop_version=3.1.1
|
||||||
|
config_reader_min_version=2
|
||||||
fields=0 48 17 18 38 39 40 2 46 47 49 1
|
fields=0 48 17 18 38 39 40 2 46 47 49 1
|
||||||
|
<<<<<<< HEAD
|
||||||
|
sort_key=47
|
||||||
|
=======
|
||||||
sort_key=46
|
sort_key=46
|
||||||
|
>>>>>>> 7a081b244222e328ccf7594597629c5d6784666c
|
||||||
sort_direction=-1
|
sort_direction=-1
|
||||||
tree_sort_key=0
|
tree_sort_key=0
|
||||||
tree_sort_direction=1
|
tree_sort_direction=1
|
||||||
|
@ -11,6 +17,7 @@ shadow_other_users=0
|
||||||
show_thread_names=0
|
show_thread_names=0
|
||||||
show_program_path=1
|
show_program_path=1
|
||||||
highlight_base_name=0
|
highlight_base_name=0
|
||||||
|
highlight_deleted_exe=1
|
||||||
highlight_megabytes=1
|
highlight_megabytes=1
|
||||||
highlight_threads=1
|
highlight_threads=1
|
||||||
highlight_changes=0
|
highlight_changes=0
|
||||||
|
@ -20,6 +27,10 @@ strip_exe_from_cmdline=1
|
||||||
show_merged_command=0
|
show_merged_command=0
|
||||||
tree_view=0
|
tree_view=0
|
||||||
tree_view_always_by_pid=0
|
tree_view_always_by_pid=0
|
||||||
|
<<<<<<< HEAD
|
||||||
|
all_branches_collapsed=0
|
||||||
|
=======
|
||||||
|
>>>>>>> 7a081b244222e328ccf7594597629c5d6784666c
|
||||||
header_margin=1
|
header_margin=1
|
||||||
detailed_cpu_time=0
|
detailed_cpu_time=0
|
||||||
cpu_count_from_one=1
|
cpu_count_from_one=1
|
||||||
|
@ -32,8 +43,17 @@ account_guest_in_cpu_meter=0
|
||||||
color_scheme=0
|
color_scheme=0
|
||||||
enable_mouse=1
|
enable_mouse=1
|
||||||
delay=15
|
delay=15
|
||||||
|
<<<<<<< HEAD
|
||||||
|
hide_function_bar=0
|
||||||
|
header_layout=two_50_50
|
||||||
|
column_meters_0=Hostname Tasks Blank Blank LeftCPUs4 Memory
|
||||||
|
column_meter_modes_0=2 2 2 2 1 1
|
||||||
|
column_meters_1=Clock Uptime LoadAverage Blank RightCPUs4 Swap
|
||||||
|
column_meter_modes_1=2 2 2 2 1 1
|
||||||
|
=======
|
||||||
left_meters=Hostname Tasks Blank Blank LeftCPUs4 Memory
|
left_meters=Hostname Tasks Blank Blank LeftCPUs4 Memory
|
||||||
left_meter_modes=2 2 2 2 1 1
|
left_meter_modes=2 2 2 2 1 1
|
||||||
right_meters=Clock Uptime LoadAverage Blank RightCPUs4 Swap
|
right_meters=Clock Uptime LoadAverage Blank RightCPUs4 Swap
|
||||||
right_meter_modes=2 2 2 2 1 1
|
right_meter_modes=2 2 2 2 1 1
|
||||||
hide_function_bar=0
|
hide_function_bar=0
|
||||||
|
>>>>>>> 7a081b244222e328ccf7594597629c5d6784666c
|
||||||
|
|
Loading…
Reference in a new issue