Merge branch 'master' into strippedstripped1.1.10.16

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf

1 files changed, 8 insertions, 1 deletions

diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h
index 1af928be8..35d5d64bc 100644
--- a/src/net/packetcounters.h
+++ b/src/net/packetcounters.h
@@ -26,15 +26,22 @@
 class PacketCounters
 {
 public:
-//    PacketCounters();
     static void incInBytes(int cnt);
+
     static void incInPackets();
+
     static int getInBytes();
+
     static int getInPackets();
+
     static void incOutBytes(int cnt);
+
     static void incOutPackets();
+
     static int getOutBytes();
+
     static int getOutPackets();
+
     static void update();
 
     static int mInCurrentSec;