[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.4.5-1-13-gdf68986

[Andrew Harvey]

The following commit has been merged in the master branch:
commit 7f76c812e197b698d64de220c27fd51f1f8ffbb8
Merge: fa4d1bbfbe6b3578be2e5eb5e87a969b5c4f16fb d06fe5b7d4fc2223833cd4550da65667bc8d98f0
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sat Jan 19 09:48:32 2013 +1100

    Merge tag 'upstream/0.5'
    
    Upstream version 0.5
    
    # gpg: Signature made Sat 19 Jan 2013 09:48:31 EST using RSA key ID DDB7E072
    # gpg: Good signature from "Andrew Harvey <andrew.harvey4 at gmail.com>"

diff --combined .gitignore
index 8b4328c,b86ab6f..fcbe042
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +/.pc
  node_modules
  .DS_Store
  tmp/**/*
@@@ -7,3 -6,4 +7,4 @@@
  *.iml
  *.sublime-*
  _site
+ dist/*.js

-- 
JavaScript library for displaying map data in web browsers