Igor Wiedler d4e00b6c0d Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10616] Add template inheritance to exported template
  [ticket/10616] Ignore template inheritance that points to self
  [ticket/10616] Add template inheritance to default styles

2012-02-07 16:57:09 +01:00

..

template

Merge branch 'develop-olympus' into develop

2012-02-07 16:57:09 +01:00

theme

[ticket/9916] Updating header license and removing Version $Id$

2012-01-02 19:10:27 +01:00

style.cfg

[ticket/9916] Updating header license and removing Version $Id$

2012-01-02 19:10:27 +01:00