[SCM] faustworks/master: Resolve merge.

[mira-guest at users.alioth.debian.org]

Imported Upstream version 0.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 305dcae29e7e6671592f7887b8e5b3c07303b694
X-Git-Newrev: 948fa39ef57d73348747a257b1a5f1c22245edeb

The following commit has been merged in the master branch:
commit 948fa39ef57d73348747a257b1a5f1c22245edeb
Merge: 305dcae29e7e6671592f7887b8e5b3c07303b694 d4d9a6d250f6288e4633d83f1f9082187e22a529
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Jun 4 13:39:07 2014 +0200

    Resolve merge.

diff --combined .gitignore
index b408e6c,42a4cf9..35d4081
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,13 +1,17 @@@
++<<<<<<< HEAD
 +/.pc
++=======
+ *o
+ moc_*
+ qrc_*
+ ui_*
+ Makefile
+ FaustWorks
+ *.app
+ .DS_Store
+ *.dmg
+ Makefile.qt4
+ FaustWorks.pro.user
+ FaustWorks.xcodeproj
+ *.qm
++>>>>>>> upstream/0.5

-- 
faustworks packaging