[embryo: 5/5] Merge branch 'f19'

[Dan Mashal]

commit 640b1b449aa1700fe76f7bac446b77046f8c8e26
Merge: 8cc8668 2b91db8
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Aug 18 22:29:05 2013 -0700

    Merge branch 'f19'
    
    Conflicts:
    	.gitignore
    	embryo.spec

 .gitignore  |    4 ++++
 embryo.spec |   19 ++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)
---
diff --cc .gitignore
index 01e32fc,9cca744..42b64f6
--- a/.gitignore
+++ b/.gitignore
@@@ -4,4 -4,5 +4,8 @@@ embryo-0.9.9.49898.tar.bz
  /embryo-1.0.0.beta3.tar.bz2
  /embryo-1.0.0.tar.gz
  /embryo-1.7.7.tar.bz2
++<<<<<<< HEAD
++=======
+ /embryo-1.7.6.tar.bz2
++>>>>>>> f19
  /embryo-1.7.8.tar.bz2
diff --cc embryo.spec
index 72dc16a,67f7d09..9ae49e7
--- a/embryo.spec
+++ b/embryo.spec
@@@ -17,11 -17,12 +17,10 @@@ Small Pawn based virtual machine and co
  %prep
  %setup -q
  
 -
  %build
- %configure --disable-doc --disable-static
- 
+ %configure --disable-static --disable-doc
  make %{?_smp_mflags} V=1
  
 -
  %install
  make install DESTDIR=%{buildroot}
  find %{buildroot} -name '*.la' -exec rm -rf {} ';'