[SCM] lvtk/master: Merge tag 'upstream/1.2.0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4fcef329c1fd40cb9f28593f6226e3fb814e294d
X-Git-Newrev: 7e748af3800451937a7691a8cb4bc9c040298864

The following commit has been merged in the master branch:
commit b5e60aad5b33ad788d58d84b774006f1f3b63788
Merge: d6a0ca99729dc531df3166de67c5c73a4d86264f 84d7ae4b110c25e4514b0de591f07952f495c769
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Oct 11 14:08:48 2014 +0100

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

diff --combined .gitignore
index 4d6a046,4e6e157..2fa96fc
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +/.pc
  *.pyc
  build/
  .cproject
@@@ -11,3 -10,11 +11,11 @@@ lock-waf
  waf-*/
  *~
  .DS_Store
+ 
+ # qt creator
+ lvtk.config
+ lvtk.creator
+ lvtk.creator.user*
+ lvtk.files
+ lvtk.includes
+ 

-- 
lvtk packaging