Merge with hotfix

--HG--
branch : develop
This commit is contained in:
kervala 2015-02-15 09:54:31 +01:00
commit 0c054b5201

View file

@ -14,8 +14,8 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef AI_SHARE_STDPCH_H #ifndef ADMIN_MODULES_STDPCH_H
#define AI_SHARE_STDPCH_H #define ADMIN_MODULES_STDPCH_H
#include <time.h> #include <time.h>
#include <memory> #include <memory>