Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 8 Mar 2012 09:08:18 +0000 (10:08 +0100)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 8 Mar 2012 09:08:18 +0000 (10:08 +0100)
commit3b9298e9f5569d02c71c4f83c83d7f63595783a9
treebb4f8273373c767cc1f814447c54622a84b04544
parent30a96a6dc151b5e2a301f00df5076bc39a933282
parent70f7658dfb32775ef940d5f680a9dad185dc2b5e
Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
MLDemos_variables.pri