Gitiles
Code Review Sign In
gerrit.witaqua.org / external_htop / d880def0e9b5dcce07917aa7cc71e49bddf21c16
commitd880def0e9b5dcce07917aa7cc71e49bddf21c16[log] [tgz]
authorHisham Muhammad <hisham@gobolinux.org>Thu Apr 02 01:57:37 2015 -0300
committerHisham Muhammad <hisham@gobolinux.org>Thu Apr 02 01:57:37 2015 -0300
treed5f742c52db243d1098832669d1de78f574ccc0b
parent4315e0c2a08b55e354d60225b8243ba1d3c6c309 [diff]
parentcb8ac6b0f1f456f94efc8aead597faf6a95788da [diff]
Merge branch 'master' into wip

Conflicts:
	Process.c
	Process.h
	htop.c
	linux/LinuxProcess.c
	linux/LinuxProcess.h
	test_spec.lua
tree: d5f742c52db243d1098832669d1de78f574ccc0b
  1. freebsd/
  2. linux/
  3. m4/
  4. scripts/
  5. unsupported/
  6. README.md ⇨ README
  7. .gitignore
  8. Action.c
  9. Action.h
  10. Affinity.c
  11. Affinity.h
  12. AffinityPanel.c
  13. AffinityPanel.h
  14. AUTHORS
  15. autogen.sh
  16. AvailableColumnsPanel.c
  17. AvailableColumnsPanel.h
  18. AvailableMetersPanel.c
  19. AvailableMetersPanel.h
  20. BatteryMeter.c
  21. BatteryMeter.h
  22. CategoriesPanel.c
  23. CategoriesPanel.h
  24. ChangeLog
  25. CheckItem.c
  26. CheckItem.h
  27. ClockMeter.c
  28. ClockMeter.h
  29. ColorsPanel.c
  30. ColorsPanel.h
  31. ColumnsPanel.c
  32. ColumnsPanel.h
  33. configure.ac
  34. COPYING
  35. CPUMeter.c
  36. CPUMeter.h
  37. CRT.c
  38. CRT.h
  39. DisplayOptionsPanel.c
  40. DisplayOptionsPanel.h
  41. FunctionBar.c
  42. FunctionBar.h
  43. Hashtable.c
  44. Hashtable.h
  45. Header.c
  46. Header.h
  47. HostnameMeter.c
  48. HostnameMeter.h
  49. htop.1.in
  50. htop.c
  51. htop.desktop
  52. htop.h
  53. htop.png
  54. IncSet.c
  55. IncSet.h
  56. INSTALL
  57. ListItem.c
  58. ListItem.h
  59. LoadAverageMeter.c
  60. LoadAverageMeter.h
  61. MainPanel.c
  62. MainPanel.h
  63. Makefile.am
  64. MemoryMeter.c
  65. MemoryMeter.h
  66. Meter.c
  67. Meter.h
  68. MetersPanel.c
  69. MetersPanel.h
  70. NEWS
  71. Object.c
  72. Object.h
  73. OpenFilesScreen.c
  74. OpenFilesScreen.h
  75. Panel.c
  76. Panel.h
  77. Process.c
  78. Process.h
  79. ProcessList.c
  80. ProcessList.h
  81. README
  82. RichString.c
  83. RichString.h
  84. ScreenManager.c
  85. ScreenManager.h
  86. Settings.c
  87. Settings.h
  88. SignalsPanel.c
  89. SignalsPanel.h
  90. String.c
  91. String.h
  92. SwapMeter.c
  93. SwapMeter.h
  94. TasksMeter.c
  95. TasksMeter.h
  96. test_spec.lua
  97. TESTPLAN
  98. TraceScreen.c
  99. TraceScreen.h
  100. UptimeMeter.c
  101. UptimeMeter.h
  102. UsersTable.c
  103. UsersTable.h
  104. Vector.c
  105. Vector.h