Overview
Comment:Sorted out conflict.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | origin/master | trunk
Files: files | file ages | folders
SHA3-256: f46546cd1fd00048fbc1f7ef2e8c64634f45ce6d8a49603687776766c80a587e
User & Date: gawthrop@users.sourceforge.net on 2013-07-21 23:57:44
Other Links: branch diff | manifest | tags
Context
2013-07-22
03:28:00
Generate usage comment check-in: 307f4a89d2 user: gawthrop@users.sourceforge.net tags: origin/master, trunk
2013-07-21
23:57:44
Sorted out conflict. check-in: f46546cd1f user: gawthrop@users.sourceforge.net tags: origin/master, trunk
23:03:40
Comment out conflicts - hope I got this right! check-in: 5bd32bdcb6 user: gawthrop@users.sourceforge.net tags: origin/master, trunk
Changes

Modified mttroot/mtt/bin/trans/mtt.sty from [278d9a1cb6] to [bc0db184f2].

8
9
10
11
12
13
14



15
16
17
18
19
20
21
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24







+
+
+







% Copyright (c) P.J.Gawthrop, 1997.

% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %% Version control history
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %% $Id$
% %% $Log$
% %% Revision 1.11  2009/06/26 01:09:50  geraint
% %% fancyheadings is deprecated, replaced by fancyhdr
% %%
% %% Revision 1.10  2005/03/15 13:36:17  gawthrop
% %% Pretty abg figure in reports.
% %%
% %% Revision 1.9  2003/05/08 18:43:02  gawthrop
% %% Generate pdf from ps (using hyperref package for links etc)
% %%
% %% Revision 1.8  2000/12/01 14:15:16  peterg
44
45
46
47
48
49
50
51

52
53
54
55
56
57
58
59
60
61
62
63
64

65
66
67
68
69
70
71
47
48
49
50
51
52
53

54
55
56
57
58
59
60
61
62
63
64
65
66

67
68
69
70
71
72
73
74







-
+












-
+







% %% Revision 1.1  1997/05/19 16:48:10  peterg
% %% Initial revision
% %%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

% Font
\usepackage{times}
\usepackage{mathptm}
%%\usepackage{mathptm}

%Verbatim file input
\usepackage{verbatim}
\usepackage{moreverb}

%Long tables
\usepackage{supertabular}

%AMS maths
  \usepackage{amsmath}

%Fancy headings
  %\usepackage{fancyheadings}
  %%\usepackage{fancyheadings}
  \usepackage{fancyhdr}

%Fancy boxes
%\usepackage{fancybox}


% Read in a verbatim file


MTT: Model Transformation Tools
GitHub | SourceHut | Sourceforge | Fossil RSS ]