diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 15:20:58 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 20:03:41 +0200 |
| commit | 7acf99de38a74673a4e57d2b7862757029ee289e (patch) | |
| tree | a78f3694bce7a249733f80d3205dba9fcfa72ad9 | |
| parent | ff496d9124b44c763cae2d45fe337e75781b743c (diff) | |
Kill this.
| -rw-r--r-- | postprocess/prj/build.lst.orig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/postprocess/prj/build.lst.orig b/postprocess/prj/build.lst.orig deleted file mode 100644 index 3cd4b803484a..000000000000 --- a/postprocess/prj/build.lst.orig +++ /dev/null @@ -1,12 +0,0 @@ -<<<<<<< HEAD -po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL -======= -po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL ->>>>>>> feature/gbuild_sdext -po postprocess usr1 - all po_mkout NULL -po postprocess\checkxml nmake - all po_checkxml NULL -po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL -po postprocess\packregistry nmake - all po_packregistry NULL -po postprocess\packcomponents nmake - all po_packcomponents NULL -po postprocess\rebase nmake - w po_rebase NULL -po postprocess\signing nmake - w,sign po_signing po_rebase.w NULL |