]> git.stg.codes - stg.git/commit
Merge remote-tracking branch 'origin/stg-2.409' into ticket26
authorElena Mamontova <helenh463@gmail.com>
Thu, 17 Mar 2016 07:39:43 +0000 (09:39 +0200)
committerElena Mamontova <helenh463@gmail.com>
Thu, 17 Mar 2016 07:39:43 +0000 (09:39 +0200)
commit8c7e6453aff765245cc5c28f37543f13d92dbe74
tree7f4a3f1d94dcb7f2ec0b6f2a5ea14f5ed52d8159
parent3a88b66f861decb863bbb00a450e2801ee668a09
parent72635da73fc450b040d72fbeca4becd73c99008d
Merge remote-tracking branch 'origin/stg-2.409' into ticket26
projects/stargazer/main.cpp
projects/stargazer/plugin_mgr.cpp
projects/stargazer/plugin_mgr.h
projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
projects/stargazer/plugins/other/rscript/rscript.cpp
projects/stargazer/plugins/other/smux/smux.cpp