commit 508dd09facc04f7c623f0f5e6834a52550abcb50
Merge: 8be9008... 776d5c6...
Author: D. Johnson <fenris02(a)fedoraproject.org>
Date: Wed Jan 5 14:54:07 2011 -0600
Merge branch 'python-development' of
ssh://git.fedorahosted.org/git/multiboot-media-creator into python-development
multiboot-media-creator.py | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 deletions(-)
---
diff --cc multiboot-media-creator.py
index 48d6d40,ef9bf77..3b5de8f
--- a/multiboot-media-creator.py
+++ b/multiboot-media-creator.py
@@@ -12,12 -12,14 +12,14 @@@
### You should have received a copy of the GNU Library General Public License
### along with this program; if not, write to the Free Software
### Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-### multiboot-media-creator Copyright 2010-2011 Robert 'Bob' Jensen
<bob(a)fedoraunity.org>, Dave Riches <email>, Dennis Johnson <email>, Ben
Williams <email>
+### multiboot-media-creator Copyright 2010-2011 Robert 'Bob' Jensen
<bob(a)fedoraunity.org>, Dave Riches <email>, Dennis Johnson
<fenris02(a)fedoraproject.org>, Ben Williams <email>
- import os
- import glob
- import tempfile
- import shutil
+ import os, glob, tempfile, shutil
+
+ __version__ = "$Revision: 4 $"
+ # $Source$
+
+ VERSION = '0.4.0'
def lives():
"""This part handles live images"""