Changeset b4e5366

Timestamp:

Jan 16, 2011 8:35:26 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

4e79be23

Parents:

7d3000e (diff), aaf7f41 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

• fedd/setup.py (modified) (1 diff)

fedd/setup.py

@@ -19 +19 @@
             'fedd_multistatus.py', 'fedd_new.py', 'fedd_ns2topdl.py',
             'fedd_spewlog.py', 'fedd_terminate.py', 'fedd_to_abac.py',
-            'fedid.py', 'fedd_to_abac.py', 'user_to_project.py' ],
+            'fedid.py', 'user_to_project.py' ],
     )