diff options
| author | megamage <none@none> | 2009-02-17 21:54:48 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-17 21:54:48 -0600 |
| commit | 89ba43ef3e3f8d4b563c9e8efaf06bf7f7b44065 (patch) | |
| tree | fbe73c4d529f195d51b8ca4b62be8443da80becf /src/framework/Dynamic | |
| parent | be53cfe1044d7e913c4c11a7245e2d2846826363 (diff) | |
| parent | 3931b802f1b8b890a615e5b2a4c0ed70407468d7 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/framework/Dynamic')
| -rw-r--r-- | src/framework/Dynamic/FactoryHolder.h | 1 | ||||
| -rw-r--r-- | src/framework/Dynamic/ObjectRegistry.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h index a9c7a718541..39c6061a687 100644 --- a/src/framework/Dynamic/FactoryHolder.h +++ b/src/framework/Dynamic/FactoryHolder.h @@ -60,3 +60,4 @@ class Permissible virtual int Permit(const T *) const = 0; }; #endif + diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h index 25dfa9f5092..6e4b9aca53b 100644 --- a/src/framework/Dynamic/ObjectRegistry.h +++ b/src/framework/Dynamic/ObjectRegistry.h @@ -108,3 +108,4 @@ class TRINITY_DLL_DECL ObjectRegistry } }; #endif + |