?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: eabafcb afde4f7)
pMerge branch 'master' of ssh://repo.or.cz/srv/git/indepmod/export
commite99a1581b0e1b0500f944da5fbab41a2e35c8318
authorTomas Mraz <mrazt@.(none)>
Mon, 13 Dec 2010 13:49:14 +0000 (13 14:49 +0100)
committerTomas Mraz <mrazt@.(none)>
Mon, 13 Dec 2010 13:49:14 +0000 (13 14:49 +0100)
tree6cb138eb4216c98526b09a05f7765d9c7e386776tree | snapshot (tar.gz zip)
parenteabafcb859a2a51e7432a5f3e6f61bfdf394203ccommit | diff
parentafde4f72c0030bd3ad5cbeda2b477f6ab501d50ecommit | diff
pMerge branch 'master' of ssh://repo.or.cz/srv/git/indepmod/export

Conflicts:
IndependentModeler/epcXHTMLExportModule.properties
IndependentModeler/IndependentModeler.ipr diff1 |  diff2 |  blob | history
IndependentModeler/epcXHTMLExportModule.properties diff1 |  diff2 |  blob | history
Plugins/EPC/ModuleEPC2XHTMLExport/test/cz/cvut/promod/EPC2XHTMLExport/EPC2XHTMLExportModuleGUITest.java diff1 |  diff2 |  blob | history
Export plug-in support for Independent Modeller