Changeset [d368012acad3ff52709bf172b015cfc2b536522f] by Ying Tsen Hong
Revision d368012acad3ff52709bf172b015cfc2b536522f,
committed by Ying Tsen Hong
· November 15th, 2010 @ 08:59 PM
Merge remote branch 'upstream/master'
Conflicts:
lib/postgis_adapter.rb
https://github.com/nofxx/postgis_adapter/commit/d368012acad3ff52709...
26 changed files
-
A
lib/postgis_adapter/functions.rb -
A
lib/postgis_adapter/functions/bbox.rb -
A
lib/postgis_adapter/functions/class.rb -
A
lib/postgis_adapter/functions/common.rb -
A
lib/postgis_adapter/railtie.rb -
A
spec/postgis_adapter/functions/bbox_spec.rb -
A
spec/postgis_adapter/functions/class_spec.rb -
A
spec/postgis_adapter/functions/common_spec.rb -
A
spec/postgis_adapter/functions_spec.rb -
R
lib/postgis_functions.rb -
R
lib/postgis_functions/bbox.rb -
R
lib/postgis_functions/class.rb -
R
lib/postgis_functions/common.rb -
R
spec/postgis_functions/bbox_spec.rb -
R
spec/postgis_functions/class_spec.rb -
R
spec/postgis_functions/common_spec.rb -
R
spec/postgis_functions_spec.rb -
R
spec/spec.opts -
M
README.rdoc -
M
VERSION -
M
lib/postgis_adapter.rb -
M
lib/postgis_adapter/acts_as_geom.rb -
M
postgis_adapter.gemspec -
M
rails/init.rb -
M
spec/postgis_adapter_spec.rb -
M
spec/spec_helper.rb