[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3.1-1-16-gd1c6144

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit e08abd6c169bad094a34ebb7ea174c0188805205
Merge: ed4f1ea7824f9c585396a5dacd43d88188958abd b9a286047f7fab842f88d6fdab2e9339cb9b4324
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jul 30 19:39:25 2012 +0200

    Merge tag 'upstream/0.4'
    
    Upstream version 0.4
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index b408e6c,559c0ab..2ce59e7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,7 +1,8 @@@
 +/.pc
+ node_modules
+ .DS_Store
+ tmp/**/*
+ .idea
+ .idea/**/*
+ *.iml
+ *.sublime-*

-- 
JavaScript library for displaying map data in web browsers