summaryrefslogtreecommitdiffstats
path: root/src/sysinfolibsysfs.h
diff options
context:
space:
mode:
authorNiklas Goby2011-04-18 09:43:34 +0200
committerNiklas Goby2011-04-18 09:43:34 +0200
commitd113dab715cea7e6f3da0a0a6e650298a6acc032 (patch)
tree65873adce9fa6401026b1b4c89f12a1e8868e3c2 /src/sysinfolibsysfs.h
parentstarted to write a function for getting all available network (diff)
parentuniformed formatting... (diff)
downloadfbgui-d113dab715cea7e6f3da0a0a6e650298a6acc032.tar.gz
fbgui-d113dab715cea7e6f3da0a0a6e650298a6acc032.tar.xz
fbgui-d113dab715cea7e6f3da0a0a6e650298a6acc032.zip
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Conflicts: src/sysinfo.h
Diffstat (limited to 'src/sysinfolibsysfs.h')
-rw-r--r--src/sysinfolibsysfs.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/sysinfolibsysfs.h b/src/sysinfolibsysfs.h
index 3da58ce..d45b0f1 100644
--- a/src/sysinfolibsysfs.h
+++ b/src/sysinfolibsysfs.h
@@ -1,22 +1,22 @@
/*
-# Copyright (c) 2010,2011 - RZ Uni Freiburg
-# Copyright (c) 2010,2011 - OpenSLX Project
-#
-# This program/file is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your feedback to feedback@openslx.org
-#
-# General information about OpenSLX can be found under http://openslx.org
-#
-#
-# Class collects informations about hardware devices of the client:
-# - ip address
-# - mac address
-#
-#
-# All methods return the collected informations as json- parsable object.
+ # Copyright (c) 2010,2011 - RZ Uni Freiburg
+ # Copyright (c) 2010,2011 - OpenSLX Project
+ #
+ # This program/file is free software distributed under the GPL version 2.
+ # See http://openslx.org/COPYING
+ #
+ # If you have any feedback please consult http://openslx.org/feedback and
+ # send your feedback to feedback@openslx.org
+ #
+ # General information about OpenSLX can be found under http://openslx.org
+ #
+ #
+ # Class collects informations about hardware devices of the client:
+ # - ip address
+ # - mac address
+ #
+ #
+ # All methods return the collected informations as json- parsable object.
* sysinfolibsysfs.h
*