in progress

Change-Id: I70b2221c9dc3a758ae30f1ead7d5a1824924f24b
in progress

Change-Id: If4c032ca7ea87db2d1c29cb0e9763e10a695780b
more reasonable first cut at java android

Change-Id: I9a1e4c8010137c6e6b97047e9a9055d8a1333590
Merge topic 'introduce_histogram_representation' into pv-master

775ec7b4 Merge topic 'fix_empty_selection' into master
cd34e287 Merge topic 'ignore-constant-expr-msvc' into master
c6200b34 Merge topic 'fix_append_filter_crash' into master
d7aca982 Fix handling of empty selection on ParallelCoordinates.
f8430aef vtkSmartPyObject: ignore warning C4127 on MSVC
b673e361 cmake: remove unnecessary condition copies
ac920d1f Fixed logic to work when an empty vtkSelection is passed.
ab0254aa Fixed error in appending cell data
13450fe7 Merge topic 'bump-metaio' into master
c4e2f41c Merge remote-tracking branch 'pvvtk/pv-master' into HEAD
6a1d3bc4 Merge topic 'fix_scalar_bar_representation' into master
cd2415bd Merge topic 'vtkSmartPyObject_documentation' into master
befcfd1f Format comments according to VTK stlye guide
47539122 Merge topic 'python_syntax_highlighting' into master
c3ee6097 Merge topic 'fix-mpi4py-include-dir' into master
cbd95551 Merge topic 'dashboard-warnings-20140807' into master
...
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: I97c094db70b835581e8a989c0e608c778e93d869
Merge topic 'java-android' into master

b1017ada more reasonable first cut at java android
5dfe80a5 in progress
f0af35e8 in progress