labofsahil/github-event-dataset-2012 huggingface dataset:
vapourware: do-sync
vapourware: git-wstash
compat-wireless: disable wil6210 for kernels older than 2.6.30

wil6210 requires MSI only availble on >= 2.6.30.

signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
Added ImageView code
	-Taking Images
	-Viewing in a gallery
	-Adding image to task
Merge branch 'master' of https://github.com/mdfeist/CMPUT301F12T12
- make side effects in isNew, isRemoved, isModified explicit
- better javadoc
- remove dead code
update docs on what the latest version is
Try to make documentation clearer.
PS3.conf: sort formats
make package-private members private
Updated Android.conf
See: http://www.ps3mediaserver.org/forum/viewtopic.php?f=15&t=14877#p73183
Change the hardcoded database name to variable.
TODO: rename "medias" -> "cache" can be done only in PMS.java
improve log messages
demote pre-banner log message
try to use correct log levels for warnings/errors
s/unicode/Unicode/
HTTPServer: cleanup
usn: clean up network interface resolution
NetworkConfiguration: make package-private members private
work around Java file permissions bugs
remove redundant file existence checks
rm references to dead blog
FileUtil: fix breaking change
FileUtil test:

	fix assertions
	revert temp debugging change
update CHANGELOG
add static ffmpeg build script
fix links
update CHANGELOG
FileUtil: add isDirectoryReadable to fix virtual folder breakage introduced in d9f89fc597
make nbcores label a string format into which the default number can be interpolated
Language icons:

	add README
	add Turkish flag
add file extensions to README &c. to simplify handling on Windows
plugins.txt -> README.txt
POM: reflect updated Windows files
lowered CPU min freq to 30 Mhz
HEMERA-2633 added test case for event definitions import
Merge branch 'ca-develop' of https://github.com/meyerdan/eclipse-bpmn2 into ca-develop
sorted map, changed file php, meta tags and analytics
Make it clear that Leiningen 2 is not a dependency end users will have to have

Someone on IRC was confused about the previous wording
Make this example complete
Vyřešení problému v javascriptu a přidání Google+ tlačítka
No characters on userplate.php
A little change in vote.php, repairing two things
Quitando una palabra que sobra...
Merge pull request #74 from melchor629/master

A little change in vote.php, repairing two things
Quitando tambien la palabra
Sobraba un ?
Merge pull request #75 from melchor629/master

I forgot this
Added some stuff in admin panel, forum admin, not finished

Signed-off-by: zalito12 <gonzalo.nom.es@gmail.com>
Some Small Updates, New Icon.

Signed-off-by: FailZorD <alexfred@live.com>
Forum admin updates, now working in IE too.

Signed-off-by: zalito12 <gonzalo.nom.es@gmail.com>
Forum admin finished, I hope :)

Signed-off-by: zalito12 <gonzalo.nom.es@gmail.com>
Added move to in forums threads

Signed-off-by: zalito12 <gonzalo.nom.es@gmail.com>
made research data into some <ul>'s
AStar works.
modified remote_file to use correct url format
massive refactor. havent tested yet.
Fill empty folder
Add .gitattributes
Renaming files
complete refactor of timevector
Identifier
Update gitignore
Message
Finish layout and routes
Merge branch 'filling-in-layout'

Merging layouts
added imagefolder
YAPC::Asia Tokyo 2012 2日目
update bootstrap, tweak repo_overview
Adding the whole project structure
DelFil
Add file for network speeds
Add the search page
Improve the search page
Improve performance of the search page
Update styles
Improve user interface of the search page
Fix an error when searching without migemo
Behave as a packaged app
Added support for Query String in options. The user can specify data to be passed by using either -q or -querystring. The query string is composed of a series of field-value pairs. For more than one field-value pairs quote the Query String with ". ex.: Single field-value pair: -q=?username=foo Multiple field-values pairs: -q="?username=foo&password=bar"
Renamed class files and directories to support PSR-0.
Updated basic formatting, copyright and corrected user guide mistake.
Updated unit test decoupling config from Dispatch. Updated changelog in prep for release.
Updated unit tests. Added uesr guide documentation.
Updating changelog in prep for release of 0.2.0. Updated user guide.
Merge pull request #2 from morgan/3.3/develop

Release 0.2.0
Removed bugged coap-client-08.
Added a new controller type - `cf-proxy-08`.
add tests for decoding with compressed pt. Fails
Slightly less wasteful OnDiskPt word conversion
Ideally, OnDiskPt would convert its entire vocabulary to Word in advance.
End screen.
Merge branch 'master' of github.com:mosowski/game-off-2012
Crates;Tile collisions;Colored particles.
Balaji/Dhivya : Ignored Import  Beneficiary Test
Balaji/Dhivya : Ignored Import  Beneficiary Test
set search pathname as a an option variable of the widget
remove useless config line
Reorganisation, cleanup, ARCified.

- Reorganisation
- Fixed compiler warnings and imports
- Removed some parts, added some others
- Converted to ARC
https://github.com/mrwasaabi/landing_page/issues/9
Add support for virDomainLookupByUUIDString

Also fix copy-pasta bug segfault from failing to alloc a resource.
vert: command line option, send-key and ...

Broken screenshot support. Now even more unreadable.
two typos
zebra stripes via css3
save filter to cookie
Last late night fix
renamed executable because of default case insensitivty of hfs+ in mac
os x
http_loadtime: fixed stderr redirection with 'time'
plugins: fix plugin vserver_cpu_ for 9+ cpu cores

Issue is that grep "cpu 1" matches multiple CPU lines when CPU1 & CPU12 exists.

Closes: D#681938
Fixed CR-LF endings
setting up rails
Merge branch 'master' of github.com:mwitek/first-rails-app
take only route from db which has a port
Create fitness.lisp
postfix tests
Initial commit
Initial commit of division file
Add rudimentary AppleScript support

Includes enough to highlight AppleScript, but lacks some things
(e.g. illegal symbols) which would help language auto-detection.
Add strings and function definitions, attributions.
Add unix and ui definitions.
Fix allowed strings

Only double quoted strings are allowed, and they may contain newlines.
Change STRINGS to STRING
Allow nested comments
Add standard commands

Commands, properties, constants, and keyword phrases
Authors, docs, and tests
Distinguish between "return" as command and constant
Start writing MVT article.
* Intro
* cucumber-chef
* chefspec
add chefspec, minitest, and start chefconf coverage
first draft of mvt complete
Add Ruby 1.8 support

Using Ruby 1.9's default block arguments breaks support for Ruby 1.8.
Merge pull request #3 from remi/ruby-1.8-support

Add Ruby 1.8 support
To bedzie kolejny dwu
liniowy komentarz :D
Fixed merge conflict resolution functions to handle multiple expanded arguments
_git_expand_args_escaped not needed
Also unset any ll function, just in case
fix up for template's source default value
(cherry picked from commit db32f511d12f0017c8c79d3e45a62c5454dcf1f1)
Urniki working on both platforms … finally !!

Signed-off-by: Jernej Zorec <jernejz@gmail.com>
Got rid of ole readme file
Migrated to Xcode 4.5 - added iPhone 5 support basics.
added documents and my paper
[NOISSUE] add license files

Added licenses files used by nGrinder.
Merge branch 'master' of https://github.com/nhnopensource/ngrinder
[NOBTS] adjust formatter.
Merge branch 'master' of https://github.com/nhnopensource/ngrinder.git
[NGRINDER-48]Create pages, update UI style or js.
upload js and css about jqplot.
[NGRINDER-190] Ramp-Up Chart didn't refresh

When change "Processes" number, Ramp-Up Chart didn't refresh.
Fixed.
[NGRINDER-42] UI element cleanup

These messages are not used.
Currently, we have no i18n message used in js file, but the related js
function is kept for later using.
Merge branch 'master' of https://github.com/nhnopensource/ngrinder
[NGRINDER-10] Support concurrent multiple test 
- Make the all test is more responsive..
- Instead of 20 second wait to terminate, change it 5 second
[NGRINDER-10] Support concurrent multiple test 
-  Make the stop and perf runnable is more stable.
Merge branch 'master' of https://github.com/nhnopensource/ngrinder.git
[NGRINDER-283] Provide DB upgrade featrue 
- Enhance the compatibility with ngrinder 3.0-b2
[NGRINDER-83] Add the UI Element to beauty 
- add chrome frame support.
Merge branch 'master' of https://github.com/nhnopensource/ngrinder.git
Formularios dinamicos
fix for EDBM_index_arrays_ensure not working as intended.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52914 954f8c5b-7b00-dc11-b283-0030488c597c
patch [#31709] Text editor: scroll margin column along with text
by Sebastian Nell (codemanx)

The margin ignored horizontal scrolling. 


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51205 954f8c5b-7b00-dc11-b283-0030488c597c
fix reading past array bounds for nearest_uv_between() and draw_tracking_tracks().


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51111 954f8c5b-7b00-dc11-b283-0030488c597c
fix writing past array bounds in imagewraposa().

also correct array sizes in othere areas.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51112 954f8c5b-7b00-dc11-b283-0030488c597c
NDOF navigation support for clip editor

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49836 954f8c5b-7b00-dc11-b283-0030488c597c
disable overwriting the PYTHONPATH for windows - reported as [#31506]


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46793 954f8c5b-7b00-dc11-b283-0030488c597c
Fix for second part of #31445: Surface "Control Points" menu is empty

The only difference that it should be Select Linked All operator added to the menu

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46670 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #31752: Select All By Layer seems not to work when object belongs to several layers

Added option which changes match policy from exact match and shared layers when
selecting objects by layer.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@47613 954f8c5b-7b00-dc11-b283-0030488c597c
fix [#32626] TIFF renders are limited to 8 bit even when we choose 16.
this is a regression with color management, TIFF's were always being written as 8bit

however the float buffer is assumed to be linear when converting from float to 16bit pixels per channel, so support for color management might need to be added here.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50839 954f8c5b-7b00-dc11-b283-0030488c597c
fix for particle system using uninitialized stack memory with midpoint of rk4 integrators.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48999 954f8c5b-7b00-dc11-b283-0030488c597c
Fix [#32013] Crash loading a 2.49b model

Problems were in the old multires loading system.

Actually, the sigsev itself was the easy part of the job (simply had to convert from tesselated data to polys/loops), but after that I was getting a horrible bunch of wild stray faces...

It finally turned out it was a mismatch in two different subsurf structs used while computing a mdisps layer from the multires DM, leading to getting complete random normals (null ones, NAN ones...), leading to complete dummy tangent space matrix, leading to absurds mdisps values...

Note: I also moved the copy of first layer's vertex and face data from old me->mr to mesh's v/fdata earlier in multire_load_old(), to be able to use general face_to_poly conversion function (later on we would have to do it by hand, the general function would erase our newly computed mdisps layer...).

Took me the whole week (something like 20h) to track this down: multires + subsurf = C nightmare!

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48897 954f8c5b-7b00-dc11-b283-0030488c597c
Added P12 and 13 to Pending
Removed custom add to admin pagehead. This is so that dynamically added JSON script is retained.
Merge pull request #1 from allen/master

Removed custom admin add pagehead instructions
ERP-20 As an ERP user I would like to create items to fill my inventory
- Removed exchange rate from Currency
got the light rotating correctly, now something wrong with view/projection
Added support for user Callbacks

Signed-off-by: Nelson Melo <nmelo.cu@gmail.com>
Site updated at 2012-12-24 14:03:08 UTC
work around systems were AF_INET6 is not defined
https://rt.cpan.org/Ticket/Display.html?id=81216
fix format - change everything to sts=4 sw=4 ts=8, prev. formatting was mostly tab 8 with some tab 4
moved SSL.pm to lib/IO/Socket/SSL.pm
use getnameinfo instead of unpack_sockaddr_in6 to get PeerAddr and PeerPort from sockaddr in _update_peer, keeping scope
add hybrid mode
Use JRuby to bundle in order to remove hard-vendored json and ffi.

By using JRuby to run the standalone bundle install, we can remove the
hard-vendored json-java and ffi-java gems from the repo. To me this
makes a lot of sense however for the time being, it relies on having
JRuby installed and running via RVM (or similar) in development in
addition to the Redcar vendored jruby-complete jar. I'm bugging people
about using MRI to install JRuby deps but it doesn't look hopeful.

If everybody hates needing two JRubies, maybe someone can rewrite the
command to use the vendored one, but that still requires getting bundler
in advance. :(
Make Diff.Compare able to cope with binary content
Change permissions of TreeEntry.cs file

Remove executable bits.
Experimental x86/amd64 version
Change pid file name and command line names so they match. Fix bug in agent.
new file:   test.md
Using instead of 'from setuptools import setup' instead of 'from distutils.core import setup' works. In either case, both methods work.
new rules added
own SK gazetter added
rules splitter added
[#17,css][s]: fix first heading top padding (messed up by fix for #13) - fixes #17.
Changed Hackathon URL to the new mock demo.
Adding hospitals to initial_data

Hospitals to go into DB
crazy optimisations all done
Remove sitepackages=true

We only need this for things that have non-virtualenv-able deps.

Change-Id: I78f85445d9a2e786f058f624b72c86d30066ed44
Update notes for submitted changes

* BUG #1039180 - misconfiguration in horizon settings leads to stack trace
Update notes for submitted changes

* Add glance client
Fix rechecks.html URL on zuul.o.o.

Change-Id: Icb504f56499651388c6dd4ba720bd55a93602322
Reviewed-on: https://review.openstack.org/18449
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Fix recheckwatch conf file.

Apparently we have two standards for [gerrit] sections.

Change-Id: Id6c3e2afa0bd294a60c64d0f23768d748ccf9491
Reviewed-on: https://review.openstack.org/18452
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
CI Documentation updates

* Add new StackForge project HOWTO
* Add third party testing HOWTO
* Add meetbot puppet module doc
* Update Jenkins Jobs puppet module doc
* Other minor fixes

Change-Id: I3870704660a38d6ce6a80f6c29010e621edfb013
rever apiId
Update notes for submitted changes

* Explicitely link pthread
...
...
Merge pull request #1 from opsed/gh-pages

Test
Added BUTTON_X to complement BUTTON_Y in save_ui

- Level editor should be all set to load up files: just needs the ui.
- Also cleaned up some stuff in level_save.
- Small commit before I start load_ui.py
Working on level_ui

I'm using the join screen to access it for now so the game's broken
until then, but I'm committing now because this UI is on a collision
course for unintuitive.
Ctrl+L in level editor to load a level

- I need to have it handle scrolling at some point.
- Something in level-saves is still busted: division_of_labor grew an
extra line of walls on the bottom.
Se añadio la carpeta contenedora de la aplicación móvil
Merge pull request #1 from haess/master

Solicitud de cambio
Fixed copy/paste on OS X with Firefox and Opera. Active selection on
print is now red.
Add test jar to lein2-style dependencies
talk now considers lightning when printing itself
a test was created for simpletalkpresenter
Removed rails 3 specific bits in order to make it compatible with rails 2
iPad icon and launch images
iPad support
Reorganizing dynamic table information tab
Adding new functionality to quota report

Quota reports now include an option for either cohort, participants
who are inneligible are no longer included in the appropriate columns
and a new "appoint" column has been added.
Update dpa_is_user_spammer() and dpa_is_user_deleted() to accept WP_User objects as the parameter. A User ID is still permitted.
edited the report
Revert "ARM: vfp: only clear vfp state for current cpu in vfp_pm_suspend"

This reverts commit 7adcfad3daacde5728baa3fcd2cd25432cdd75d5.
Added V(R) I/O Scheduler
Conflicts:

	block/Kconfig.iosched
	block/Makefile

Signed-off-by: Paul Beeler <sparksco@gmail.com>
Added kernel config option 'BCMDHD_WIFI_PM'
Config:   Enable BCMDHD Power Management and VR I/O scheduler

Signed-off-by: Paul Beeler <sparksco@gmail.com>
cpu-tegra3: reduce DOWN_DELAY_MS
Pegged uploadtemplate version for testing.
bz19360. Delete cached thumbnail resizes when saving a new thumbnail.
bz19277. Removed admin-specific duplicate video submission error.
Styled the email share form.
Remove height limitation from textareas.
Simplified the video grid list template.
Finalized references to 1.8.3.
Merge branch 'release/1.8.3'
Corrected ENABLE_CHANGE_STAMPS location in update_publish_date command.
Merge branch 'master' into release/1.9

Conflicts:
	docs/conf.py
	docs/installation.rst
	example_mc_project/requirements.txt
Manually fetch tags from same db as video when indexing.
Disable uploadtemplate loader during video indexing.
Make sure haystack templates pull tags from same db as videos.
Bumped django version to 1.3.2.
Security release: https://www.djangoproject.com/weblog/2012/jul/30/security-releases-issued/
Bumped django version to 1.4.1.
Security release: https://www.djangoproject.com/weblog/2012/jul/30/security-releases-issued/
Merge branch 'release/1.8.4' into release/1.9

Conflicts:
	example_mc_project/requirements.txt
	localtv/templatetags/filters.py
Backported changes to mark_import_pending video activation from 1.9.
Moved video thumbnail saving functionality entirely into the task.
This includes refreshing the video after downloading the thumbnail, in an attempt to avoid race conditions with mark_import_pending.
Separated thumbnail file saving from instance saving.
This helps avoid race conditions during video imports.
Added non-field errors to forms.
Remove the check for vote counts.
Reviewed the remainder of my Fresnel notes.

modified:   modernOpticsProblemSet2Problem2.tex
renamed:    modernOpticsProblemSet2Problem2CornuSpiralPlainPlotFig4a.png -> ../phy485/figures/modernOpticsProblemSet2Problem2CornuSpiralPlainPlotFig4a.png
modified:   ../phy485/modernOpticsLecture5.tex
modified:   ../phy485/modernOpticsLecture6.tex
libusb: Generate a universal binary with both i386 and x86_64
Adding example fact types to Fact model. (fact_type field should be decision list)
[tts_app] fix -h option handling
headerfile hinzugefüht für databasehandle
Model testing; front end tweaks
github issues, reverting version for the moment
directions mapping works
took off trailing semicolon
0.2.11: fix typo of findView as fView
Added some zombie tests.
moved non-map draw to freeserf
Added extra arg to get back the autogenerated CSS
Update lib/services/api.rb

Micropayment bug: if testMode is not set, it will be set to "1". No joke. Revert when fixed.
Merge prosilver differences into default and add theme option.
Merge remote-tracking branch 'prototech/task/merge-styles'
Custom BBcode Stuff
More BBcode Stuff
Make the Custom BBCode type functional.
This shouldn't be here anymore
Fix agreement
Merge branch 'feature/bbcodes'
Fixing typo
Add expand/contract buttons to revision list. Bug #62165.
Merge remote-tracking branch 'prototech/ticket/62165'
Add BBCode demo and fix warning due to undefined array key. Tickets 63163 & 63165
Merge remote-tracking branch 'prototech/ticket/63163'
Cease subscription dialog cookie is  not applying to entire CDB. Bug #63172
Merge remote-tracking branch 'prototech/ticket/63172'
Store category and phpBB version support data in Solr so we can reference it in queries. Ticket #62963
Merge branch 'master' into ascraeus

Conflicts:
	titania/contributions/revision.php
	titania/includes/core/titania.php
	titania/styles/default/theme/tweaks.css
created package
Added Settings menu
Added color mode selection in settings
Got the map transition working, but I want it to happen just at the view level, not flipping the entire view controller level.
Now the view flips accordingly (doesn't flip the whole controller), and I properly add pins to the map.
Made my own object that conforms to MKAnnotation so that I could show the proper title & subtitle when the pin was clicked.
Fixed all connections for search results and profile. Both view controllers are being populated correctly now.
Fixed merge conflicts
Flip works, bar button images are correct, but pins are default red, no arrow on callout.
Merged flipped map view
"persistent", yo
Added truncateWithTitle option, which adds a title to the wrapper if it gets truncated.
Fixed bug in 'add remote datachannel'
rename stacktrace to backtrace
Bump version
Fix Travis CI url format
Moved dashboard links out of the way of scrollbar
updating the memory layout to the "official" version
OK
a special version of skiplist used for joining arrays
made jnode_t complete data type so that it can be allocated from outside
changed the behaviour of jlist_add when an item already exists, plus added size and value to the jnode
more work
jlist_first
replicated some fixes of jlist to skiplist
new join changes
jlist on the stack
more work
ok
Merge pull request #2 from xekoukou/master

more work done
Bad names
reverting to old upvote
Added project and NuGet package configuration
Overridden versions of the previous method in the subclasses
Comments and ensuring dropped as child when moving
Implementing parent and ancestors pattern
Updated tests to confirm to strict standards
Merge branch 'refs/heads/Hotfix/StrictStandards' into release
Merge branch 'refs/heads/release'
gameplay als Server sendet nun an den Server und an den player an sich
grafische darstellugn der 2. bombe hinzugefuegt
mapeditor fast fertig
Castle 3 map is now complete (w8ing 4 orb :D)
JDocs fuer diverse Klassen
Move- /BombHulk.java geloescht :D
warnings behoben
Merge branch 'master' of github.com:propra12-orga/gruppe27
NetzwerK
Merge branch 'master' of github.com:propra12-orga/gruppe45
IP
Merge branch 'master' of https://github.com/propra12-orga/gruppe45
Aenderungen fuers Netwerk
merge
Provide different drawables and overlays
Update error message

	new file:   res/drawable-hdpi/pin_blue.png
	new file:   res/drawable-ldpi/pin_blue.png
	new file:   res/drawable-mdpi/pin_blue.png
	new file:   res/drawable-xhdpi/pin_blue.png
	modified:   res/values/strings.xml
	modified:   src/main/java/ch/eonum/HealthActivity.java
Avoid creating a singleton when internet connection is not available

Add some minor updates to tests

	modified:   src/main/java/ch/eonum/HTTPRequest.java
	modified:   src/main/java/ch/eonum/HealthMapView.java
	modified:   src/main/java/ch/eonum/Logger.java
	modified:   src/main/java/ch/eonum/TypeResolver.java
	modified:   src/test/java/ch/eonum/test/JSONParserTest.java
	modified:   src/test/java/ch/eonum/test/TimerTest.java
Remove result limit in drawSearchResults

The limit will be set in filterResults

	modified:   src/main/java/ch/eonum/HealthActivity.java
Remove and merge duplicated entries which differ only in type

Parametrize strings
Add online check in HTTPRequest
Remove activity entries from manifest

	modified:   AndroidManifest.xml
	modified:   res/values/strings.xml
	modified:   src/main/java/ch/eonum/HTTPRequest.java
	modified:   src/main/java/ch/eonum/HealthActivity.java
	modified:   src/main/java/ch/eonum/JSONParser.java
	modified:   src/main/java/ch/eonum/MedicalLocation.java
Merge branch 'master' of github.com:pse-team2/eonum-client

Repair incomplete refactoring

Refactoring from commit 2abea8205823dc0499e007cf519f640e39014443 did not reach all methods. This resulted a broken build after the merge was resolved.

Affected files:
        src/main/java/ch/eonum/CategoryResolver.java
        src/main/java/ch/eonum/HealthActivity.java
        src/main/java/ch/eonum/MedicalLocation.java
        src/test/java/ch/eonum/test/JSONParserTest.java

Conflicts:
	src/main/java/ch/eonum/CategoryResolver.java
	src/main/java/ch/eonum/HTTPRequest.java
	src/main/java/ch/eonum/HealthActivity.java
	src/main/java/ch/eonum/HealthMapView.java

	modified:   AndroidManifest.xml
	modified:   pom.xml
	modified:   res/values/strings.xml
	renamed:    src/main/java/ch/eonum/TypeResolver.java -> src/main/java/ch/eonum/CategoryResolver.java
	modified:   src/main/java/ch/eonum/City.java
	modified:   src/main/java/ch/eonum/CityResolver.java
	modified:   src/main/java/ch/eonum/HTTPRequest.java
	modified:   src/main/java/ch/eonum/HealthActivity.java
	modified:   src/main/java/ch/eonum/HealthLocationListener.java
	modified:   src/main/java/ch/eonum/HealthMapView.java
	modified:   src/main/java/ch/eonum/JSONParser.java
	modified:   src/main/java/ch/eonum/Location.java
	modified:   src/main/java/ch/eonum/Logger.java
	modified:   src/main/java/ch/eonum/MapItemizedOverlay.java
	modified:   src/main/java/ch/eonum/MedicalLocation.java
	modified:   src/main/java/ch/eonum/Mode.java
	modified:   src/main/java/ch/eonum/Timer.java
	modified:   src/test/java/ch/eonum/test/JSONParserTest.java
Merge branch 'master' of github.com:pse-team2/eonum-client

Conflicts:
	AndroidManifest.xml
Fixed regression test examples (added telephone number)
Fixed rotation, added 3rd type
Merge branch 'master' of github.com:psubocz/garden-dWARves

Conflicts:
	server/physics.py
debug
Finished Plotting Message
Replaced image sprites with primitive sprites
Merge branch 'master' of github.com:r2jitu/canvas-invaders
merge upstream
Geolocalização no link de busca

Agora a primeira busca abre os problemas ao redor do usuário

TODO:
  - Remover código de geolocalização do template de busca (DRY)
  - Verificar necessidade de alteração de layout devido à mudança
missing if. fixed
mudança na ordem das tabs de busca
Merge branch 'master' of https://github.com/rafaelmachado/deduraai
gov_login on titlebar and no vote if not logged in
busca direto por endereço
arrumando modal
Merge branch 'master' of https://github.com/rafaelmachado/deduraai
Merge pull request #32 from victal/master

Bugs Corrigidos e Pesquisa por endereço
Alterar em Venda
Basic Twilio Configuration.
joomla site gitignore
updating Itin info

and DW notes
add task mvc
Move files to the right place.
Catch up to joomla/joomla-platform@aea3dd73a578efeeb6e194abffa944863542256a
Remove uneccessary jimports().
Change the version numbers to 3.0
Remove deprecated CMS code.
Remove the DS constant.
Remove the JElements that are part of the CMS.
Enforce PHP 5.3.1 in the installation.
Remove PHP < 5.3 checks
We need the platforms legacy mode for the CMS.
Fix new strict warnings.
Remove more jimport() calls.
Replace uses of JHtml::core()
Add the JLog -> Message Queue bridge
Remove code not needed in PHP 5.3.
Fix JHtmlIcons.
New minor 0.3.4.

Fixed few internal functions, added django requirement
Database: Added an interface to the database-adapter and made the adapter return AlarmTime-objects
Changed symbols to strings in attributes/default.rb per foodcritic feedback
Unzip client files to relative path
Octopress init
Site updated at 2012-04-26 09:10:24 UTC
Working on Preview
Dropping Function.
Removing unused code.
Converting XFunction to Scala.
Replacing java.lang.Integer with Int.
Changing the name to bin4s as it no longer relates to Java.
update libpower
update prebuild app Makefile
add glob to dependencies
Fixed media filter bug on search sheet
Added library selection
Gave new Look and Feel
- sub_bytes working correctly
- start implementing key expansion
Status OK is not expected here.
1-wire presentation
better warn message
Merge branch 'master' of github.com:ronanguilloux/php-gpio
backlog
param in .ctor to set the DS18B20 address
Merge pull request #29 from ronnywang/master

Pix_Table some update
httprequest parse() done
add 3-LaxinoTech
Deleted articles/1900-05-17-the-wonderful-wizard-of-oz.txt
Site updated at 2012-05-02 09:02:24 UTC
1.1
Git ignore
[#25] config paths are now fixed to ROOT/config
[#24] use concept in config
Merge branch 'master' of https://github.com/ryanknu/zule-framework
Add link to Everyday
Base64 encode and decode on filedata to avoid error.
Merge pull request #3 from onefriendaday/patch-2

Base64 encode and decode on filedata to avoid error.
Merge branch 'master' of ssh://git@github.com/sajohan/SensorViewer3D.git

Conflicts:
	src/view/GraphicsPane.java
Merge branch 'master' of ssh://git@github.com/sajohan/SensorViewer3D.git

Conflicts:
	src/view/GraphicsPane.java
Removed unneeded old version of responsive layout styles.
Added support for Internet Explorer 6-8 regarding page layout.
Merge pull request #29 from grantpalin/master

Pulled out old responsive styles, added support for IE<9
Add logging support.
Change deprated servletContext to applicationContext.
Remove the deprecated UrlSupport trait from the mixins.
Use the new ActionResult instead of the HttpStatus trait.
Change the parameter description from val to def.
Implement the filter's destroy() method to properly shut down the database.
Implement rendering the parameter description. Work in progress.
global reduction added
Fix possible NPE when logging in/off (see #8968)
Fix export scripts (mimetype + permission check)
Fix loading of tags/attachments (see #8948, #8947)

Depending on the group permissions and the status
of the user currently logged in. Load the appropriate
annotations.
Fix export scripts (mimetype + permission check)
Web allows Chgrp for Data-Owners only. See #8974
Fix bug in batch annotation of wells.
Notify users when the move between groups is done (see #8077)
Merge remote branch 'will-more/sprint16-bugfixes' into sprint16-bugfixes
passing connection as a fist arg of the Wrapper
Handle report error and move data selection.
Allow to move w/o target, set correct icon (see #8976)
Fix user notification when transfer completed (see #8077)
Fix NPE when linking object to transfer (see #8972)
Add test for chgrp see #8979.
Review Call bak and Creation of new target object.
Adding webclient/saveImgRDef and resetImgRDef delegate to webgateway
Fix delete of ROIs by admin/group owner (see #8937)
Remove figures from display when deleted (see #8937)
Img viewer uses {{viewport_server}} for saveImgRDef and resetImgRDef
Webclient image_viewer 'viewport_server' no /

Seems that the 'viewport_server' parameter should not have a trailing slash.
E.g. '/webgateway' or '/webclient'. Don't want to change what reverse('webclient')
produces since this would likely create many other similar bugs elsewhere
revert local configuration.
Created new Rails project.  Installed devise gem
few fixes to the build process and versioning.
case sensitive and insensitive tag checking

tag checker will now determine whether the underlying document is case sensitive and based on that, check the tags in a case-sensitive or insensitive manner
use jetty instead of writing files all over the filesystem
disable irc notification
render() method on TeiDisplayText, untested.
Mac project file changes
add a abug
update closest locations to work with core data
refactor recent additions to work with core data
Merge branch 'enhancements'
Relocating design images
Add EV_Bar_Chart
Fix for endless unzip loop.
Fixed some parallax and added require.js again.
Improved Exception handling
Removed Emitter class. All test passed
working on making proposed commit message nicer
- z-index variables set
- navbar has shadow
- well color added
minor bugfix to the SimpleMeshMS class
make serval-node/import directory so that rhizome can work.
pulled in rhizome debug improvments.
Looks like manifests are being sent or received without associated
signature blocks.
Merge remote-tracking branch 'origin/noSipDroid' into shinyrhizome
Upgrade to servald with better debug options
Add notification to restore in call screen during call

Set task afinity for in call screens
Made sure the peer list is updated once the monitor interface has successfully connected and been configured
Reworked interfaces for call handling
Marked vomp state enum as deprecated, in future we should use the new set of monitor commands.
coins spawn better, trees are realistic
coins spawn in right places, baobab trees are solid
mario's qt project
fix invalid cookieString bug with llBackupBot, fix reauthentication.
modified the graphs, fixed the weird issue with overlaying the graph twice.
chat have been fixed
defconfig: 0.65 beta

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
thermal: don't calculate max everytime, once is enough

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
thermal: fix hardware issue with temp sensor 1

Ignore insane values and also ignore sensor 1 in suspend.

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
Gives only one possible solution
Merge branch 'master' of http://github.com/shubhamsha12/crossword
fix some typo
modified: bin/froscon2012.odp and txt/froscon2012.txt
Add styling for images in posts
Add adaptive images cookie
Add highslide class to images automatically
Style blockquotes
Integrating in the BSD form into the site and a few additional HTML tweaks. Removing the news page - as I don't think we will have time to get it working
just merged rosses changes
Stats de l'élève déplacé dans ces demandes
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:skdamico/history_of_cg
Add --to-file and --from-file command line options.
Print the algorithm in the output.
access results via getXXX methods only, calculate all results in ctor
packed ppm decoding in one function
Back to v3.7 state
mtd: support larger OOB
mtd resync: autodetect bus width
mtd resync: nand_get_device change
mtd resync: improved onfi_set_features comment
Add comment about u-boot's use of nand_release_device
mtd resync: de-select chips when not used
mtd resync: WARN on non-ready NAND chip
mtd resync: Use proper define macros
mtd: remove unused chip references
ONFI need to be probed in 8 bits mode
mtd resync: fix comment about periods
mtd resync: Print chip size also
Use hashed url as cache key.
Some formatting changes.
improved use of accessors
Correct indentation
Simplify init procedure
Get calendar's to choose from
Support score higher than 99 in HUD

git-svn-id: https://smokinguns.svn.sourceforge.net/svnroot/smokinguns/trunk@656 07eb42f0-b032-4355-afd3-42b1f3832223
jtFitness updates to handle pathways
#63 - also applied to dev spec (@rstoyanchev)
changed the example to reflect usage with eblearn trunk
fixed readme
Fixed connection bug
Merge branch 'master' of github.com:soundwalkers/soundpath
Eggs update
Let ntp::server be a list rather than a string
Instruct ntpdate to use a high port to avoid firewall problems
pass through view context to subview by default
accessor method for child views
fixed CLI spec to pull a fixture meatfile in.
Here is the base code for the gestures

been uploading to the wrong branch
bootstrap 2.1.0->2.1.1
new version
Identities增加生成随机Base62编码的字符串
#9 增加RMI集群版的配置文件
Added inheritance test with sub block replacement that fails while caching.
Merge pull request #41 from gw0/bug-subblockcaching

Added inheritance test with sub block replacement that fails while caching
split visitor info into multiple pages
[TIMOB-8499]MINOR FORMATTING ERROR
Full solution done!
change > to < in pvalue table
removed target
removed target
Adding generated sprite to gitignore
Update homepage
Update poetry index
readd setting of encodings, formerly in bootstrap.php
Merge pull request #28 from mikey179/master

readd setting of encodings, formerly in bootstrap.php
Sockets are mostly up and running
Default theme to steeef, other themes that can be considered dpoggi, tjkirch
Alles funktioniert!
svn integration
css issues
Merge branch 'master' of github.com:supriyak/refinery_repo
add approver list module
top 3 are optional now send via email - issue #56
Adding a blank version of the Shell outline
Dev branch update
Fixes
Dev checkouts
Merge branch 'dev' of github.com:syddjurs/os2web-deploy into dev
Added dependency to ctools in os2web.info
Added modules to make file: ctools, features, link
Added modules to make file: job_scheduler, views
Added module to make file: feeds_xpathparser
Additional modules and setup
Additional modules and setup
Flere moduler
Auto Ofir import
Cleanup
Additional modules and setup 
Additional modules and setup
Removed ballerup taxonomy feature from os2web.info dependencies
Added default feed urls to os2web.profile
Merge branch 'dev' of github.com:syddjurs/os2web-deploy into dev
Small updates
fields and stuff
Remove CVS/
Try to use a new language file format
Huge refactoring and it's backup before next step. Added some util functions/classes. Tests restructured.
added attempts to get_server method
正規表現よくわからん
Site updated at 2012-12-15 19:28:37 UTC
simlulate enabled in Mac
Added ::setCSRFTokenField()
Fix test file path handling, refactor/tweak reporting
fixed getweights()
fix low volume for some effects
simplifying generators
Minor redesign of stuffs and things
Styles share links and adds contact us
Fixing styles and test button
fixes #1759 - puppet 2.7.18 changed puppetca output

which result in adding quotes to the certnames.

this patch should cover both cases (older and newer puppet)
Update readme.md

edit readme
Add usage information (tracking --help) to readme
added pear file
added cyborg bootswatch
nudge coursebox text down
report_guenrol: more options
Merge branch 'gu23' of https://github.com/ds125v/moodle-bootstrap into gu23
A busca do livro feita no site ja esta ligada ao colmeia.So falta arrumar a resposta, coloca-la num objeto livro e imprimi-la pro usuario numa nova tela
Update README.md

Create first README version
Random
Test
Fix missing N_VFP_ARGREGS
Template chords.
Made paint color generic.
checking credential before showing profilr
add user name to facebook message
removing libtiff fix
Store password SHA-1 instead of the password.
Clicking the 'Anonymous' link does nothing.
parsing is done.  data is now seperated into a dense-matrix for the overall structure, users and items
completed ssh-copy-id.sh
minor improvement to ssh-copy-id to not force quiting connection master but try best effort to detect authorization of custom key
Some more todo items
todo cleanup
Polydisperse shear isn't working
-Loop through each course and apply config
throwing spaghetti from repo_git
#372989 Fix bug with specs after add redirect to back
fixed broken book form in admin panel
Merge branch 'master' of github.com:tomaszgieres/Books-LLP
add some config for slate to replace divvy and quicksilver app switching function
Moved all files into subfolder for better structure
- Changed something
Merge branch 'master' of https://github.com/tpepels/turtlebot_slam
No braintree payment profiles
Removing unnecessary coffeescripts
Modified moving scripts and added archiver script.
Added vc2010 redist
Added heroku fix to gemfile
added update policy for PUTs
mini cleanup of examples
Added examples to the Collection Class #10
Changed directory structure to match Go 1
Add tutorial 26
<c-f> position related bug fixed
Implemented the beginnings of inheritance
Korjattu testin apuluokan nimi
M  _jbuild.sh
Light direction hacking: use shader to debug light vector.
unittest: fix LD_LIBRARY_PATH with expressions

Need to resolve scons expressions from the SCons.Environment before to put it into the subprocess environment.
openimageio: fix dependencies
Site updated at 2012-09-01 04:08:13 UTC
vaineye show err msg regardless of msg size and don't insert if we have no requests.
azure creds
twilio SMS testing
rename rootElement to just element
added element listener
cleaning up the example
[REF]. Actualización de archivos de jquery para los resumenes de las ventanas emergentes 2.
[REF] Acomodar el campo resumen de biblioteca.
building with relative paths
Fixed url
Content and style for Index page
removed gif support at the moment to see if I can get cameo-bobross to build
Completed contents design
Introduces migration to move tweets under search terms, adds a new partial for search term listing
scripts working for chrome
Disable chef to debug
Tiny typo fix in docs/index.md.
Merge pull request #107 from laggyluke/gh-pages

Tiny typo fix in docs/index.md.
Agregue el render en el controller de TestGit
세팅완료.
More short report summary edits
Source and Election always should be sent by the client unless an xml is being provided
add opinion_model
Modified interface with 800
big change for dir, add setup.py
dev-env-linux32 add -z defs
Merge remote-tracking branch 'refs/remotes/origin/t/3rdTools/zlib' into HEAD
Remove superfluous submit button on pane edit form.
[PATCH] try to fix feed host url.
publish.
Across the board general development commit
Across the board general development commit
Finished up first paper
Check that user exists before updating roles
No Rads at Spawn
Gold Armor as Rad Suits
Local Chat Enabled
Add user and host prompt detection for 104
Changed in collition in GameModel
opa gangnam style
opa gangnam style
KISS
node and egde betweenness
outdated
usage update
make exec
usage update
clean up
explain files
local/global
local values only
suck
whatever
fix broken p
add new ctype for articles "landscape"
add chrome extension talk
error with tender_offer price
Changed Thread --> Coar
Site updated at 2012-12-26 09:23:34 UTC
tableditor开发中...
update blog http-protocols
ignore output dir
Update documentation
Merge branch 'gh-pages'
Update documentation
Merge branch 'gh-pages'

Conflicts:
	feeds/all.atom.xml
ignore .Ds_store
Do case-insensitive matches.
add some cats into game
putting JS for UI first for designers
Flanger on/off, control flanger depth via left touch slider
XE-1254: Fail to start because of dead .tld files links
(cherry picked from commit 485dab8d3df7d6673c22bdc78171b1054ab1aa1f)
XWIKI-8576: Remove spurious messages when executing XWiki in tests and improve stopping XWiki
+ added cuttng and pasting cells (MMGridViw).
er| shadergraph|: phong shader. (step 10, specular but not correct)
get_name used to return u'None' if no translation was found
Tried to fix WebVIew, Added all images for Tropes
Changed name
fixed issue with logging existing user without authentications
add title on the menu

Signed-off-by: yud1z <yud1z.dev@gamilc.om>
fixed margin-top and bottom of h1,h2,h3,h4,h5,h6
fix space
use the when instead of the if
add condition when jste-test-name was null
fix typo (rist => list)
refactor
refactor
test for import project from checking out from github.com
remove .py check
created index, contact and disclaimers
fixed font face for ff and added CNAME
added video and gallery pages, added content for video, modified social links, added subnavi for portfolio
added videos and gallery, added subnavi, modified social links
puch user info into database
Site updated at 2012-04-13 01:36:10 UTC
add startServer
add hit detection for Traingle&TriangleFilm
Server url changed to localhost.
fix bug that doesnt allow a Proc sanitizer to return null
Site updated at 2012-04-01 16:33:16 UTC
fix import stat
test nodefly on heroku. hope it won't break anything
remove nodefly
uncomment the uncaughtException handler
rewrite pac file
returning DIRECT for proxy address causes some troubles?
Updated the old code.zikula/content link to the new github/zikula-modules location.
clean repo
files removed
build the book
Merge
Adjusted paths to get tests working
Modified paths to allow tests to work
phpでモジュール化してちょくちょく編集
added easytags (commented out) to check out plugin later
Added 3D effect to logo; changed date format on bulletin
fixes missing identifier on collectionItemKeyForLayoutAttributes (via @michaelmcdaniel)
Using indexOfObjectIdenticalTo rather than indexOfObject.
Forward layoutAttributesForItemAtIndexPath: and layoutAttributesForSupplementaryElementOfKind:atIndexPath: to the layout.
Remove duplicate shadowed variable.
fixing issue #59 'visibleCells returns all visible views not just cells'
Merge pull request #60 from toco/master

fixing issue #59 'visibleCells returns all visible views not just cells'
mouseover imatges menu projectes, imatges petites contenidor projectes arreglades
Merge remote-tracking branch 'origin/1.1'
UPDATED README

Updated some of the information and fixing some mistakes in the readme
space between rows
Correct link to protocol spec
including tests to be implemented in the future
Merge branch 'master' of https://github.com/AdeleResearchGroup/ApAM
Add API for managing mob spawn limits per-world. Fixes BUKKIT-1565
Updated version to 1.2.5-R1.2 in pom.xml for Beta.
Updated version to 1.2.5-R1.3-SNAPSHOT for development towards next release.
We default to OP
Made clearPermissions public. Addresses BUKKIT-1541
Making MemorySection much more efficient; Addresses BUKKIT-1454
Set help index page to 1 for invalid numbers. Fixes BUKKIT-1569
Updated version to 1.2.5-R1.3 in pom.xml for Beta.
Updated version to 1.2.5-R1.4-SNAPSHOT for development towards next release.
Interface for storing a dispenser as a projectile shooter.
- Added ProjectileShooter interface.
- Deleted EntityDamageByProjectileEvent; it's deprecated, it's not used anywhere, and it caused compile errors with the ProjectileShooter interface that would not be easily fixable.
Move launchProjectile from LivingEntity into ProjectileShooter, replacing the former fireProjectile method.
Fix pom
Made the timings command bake before requesting the listeners. Not sure if this is necessary.
Improved event error reporting.
Revert "Move launchProjectile from LivingEntity into ProjectileShooter, replacing the former fireProjectile method."

This reverts commit d509d53817c5cea36bc91970f5c9401dc46675e0.

Conflicts:

	src/main/java/org/bukkit/entity/ProjectileShooter.java
Nuking an entire API w/o regard to plugins isn't cool, yo
Fake the drops API, not implementation
Interface for storing a dispenser as a projectile shooter.
- Added ProjectileShooter interface.
- Deleted EntityDamageByProjectileEvent; it's deprecated, it's not used anywhere, and it caused compile errors with the ProjectileShooter interface that would not be easily fixable.
Css
foundicons
+++ Fixed constructor bug in Array.h (library). When multiple inheritance occurs, we must be careful with virtual inheritance !
--- Deleted Array project in Dev tests
GUI.Window resize corners corrected
Fixed the notification error of login and register using sina weibo
Fixed the notification error of login and register using sina weibo
format code
delete duplicate empty line.
remove the space tail.
Initial GuiAnimation added.
Reworked opacity to be stored in that wasted color byte.
Fixed listSelectorColor's alpha not working properly.
Convert relative paths to absolute before sending to daemon.
Remove now-out-of-date notes regarding CWD expectations.
The shim library should now be thread-safe.
Start to convert from Eternium to generic Challenge
Fix ifdef matching
Steel man enforcement
Computer now knows not to take the top left corner if the player opens with two sides away from it
remove sina weibo auth
Modify code to avoid AJAX use
Track sessions for rendering purposes
remove controller interaction with /helper, add separate modules to draw from instead
Add eco gem
remove eco gem
Merge pull request #6 from Ariel-Thomas/no-ajax

Modify code to avoid AJAX use
Merge branch 'stable'
Moving files in for bringing admin commands into CLI guide.
Adding new files for reporting feature's new commands.
Edits to move admin commands from Admin Guide to CLI guide.
Changing nightly repo path for 3.2.
Added exports for node env
Refactored cohort model and related view to cohort tool controller
Bump dev-util/google-web-toolkit to 2.5.0_rc1
Updated dev-util/phpsh ebuild, and added a pinned-down version
Add bitpop16() in util.c.
adding my_routing_spec.rb
Use socket from gevent
improved governer
execve: make responsive to SIGKILL with large arguments
add the Stochastic Fair Blue (SFB) network scheduler
ARM: improve compiler's ability to optimize page tables
Revert writeback: fix WB_SYNC_NONE writeback from umount
add admin report field: commune instead of ward
Do not forget the add Dude :-)
edited controls and added old jar for char editor
Ira basic animations done.