labofsahil/github-event-dataset-2012 huggingface dataset:
Identified way to get inner polygon rings
Merge branch 'master' into inner_rings
force multipolygon to single polygon and add new data test from osm.
Merge branch 'master' of github.com:AIFDR/inasafe
Refactored common code to get ring data into one function
Entered ring points directly into array. However, would be nice if OGR could provide them as vectors
Cleanup
Merge branch 'master' into inner_rings
Added geometry class module
Refactored polygon layers to use new internal object structure
Allowed geometry comparison to disregard order and tested various cases
Started work on test on polygons with inner rings
Refactored creation of polygon geometry to use LinearRing instead of WKT
Got storage of polygons with inner rings to work
Got reading and comparison of polygons with holes to work
Minor bug fix
Pep'n lint
One more test using a real life polygon with holes
Optimised populate_polygon
Got clipping to work for polygons with holes
PEP8 etc tidy ups
Pycharm updateS
Tried new interpolation function in flood_OSM building impact
Refactored main interpolation function
pep8
use LinkedData and Rdfa Wrappers in Pingback
Merge branch 'develop' of github.com:AKSW/OntoWiki into develop
DebugDataProvider.java was implemented
Exposed buf to the world
comment-list ID are now per scan, not global
cleaned-up scan charts
ARELLE-192, changed UTR test from namespace trigger to standard namespace element UTR trigger
Added US-BPG test 2.3.3 for pureItemType denominators
add apidocs directory for sphinx
[cfid-144] scim queries now producing results

There was a bug tickled by the /Groups changes that caused a multi-page
list to be empty on the second iteration.  Fixed in the paging list
implementation.

[Fixes #36825399] [cfid-144] scim query fails when over 200 users and no pagination parameters

Change-Id: I92d108be9e34cffeab47cd401b27910e73452c2d
[cfid-148] sync groups only for the sublist of users being requested

Originally, a GET on /Users would sync the groups field for ALL users matching the given
filter, which is unnecessary.

Fixes the error described in [#36956263]

Change-Id: Ib9109532b0ada6b37964311dd944f5cb3676ab2a
Merge branch 'release/1.2.0' into develop

Change-Id: I14e79b5cce62e65452accb8adc7b9c26f5d11ffc
Bumped the UAA to version 1.2.1

Change-Id: I38e3366780e98c994410719d5f6732ab4251e964
Merge "[cfid-148] sync groups only for the sublist of users being requested" into develop
[cfid-154] Make sure Views are not cached by ForwardAware*

Caching view instances is done by default in Spring MVC by name
whereas we sometimes use teh same view name to refer to different
content types. The problem manifests itself when a user renders
the approval page in a browser (HTML) before the login server
has a chance to grab it in JSON.  If only the login server
accesses that page everything is fine (in once people stop
using the UI at UAA it would be fine, but only if everyone stops
forever).  Also relevant to [#37014635] [cfid-153].

[Fixes #37022525] [cfid-154] UAA is not returning options and
scopes in JSON from /authorize

Change-Id: I50ab36f8085d41db64034adcff9857ee28b6c74f
[maven-release-plugin] prepare release 1.2.1

Change-Id: I2e410fb36f47dc93f0704c92012aa2420fd9fb9f
Merge branch 'release/1.2.1'

Change-Id: I5a2f09ba9f3668c983d5fb58d6aa611ce1407494
Program v4
RSS addon: add Lorris mobile rss feed
Make sh read .profile when it starts (sh -l)
[FIX] XQuery, updating check fixed for if expression
[MOD] XQuery: treat functions returning empty sequences as vacuous
[MIN] removing out.println
enter the new mfakto.ini settings for GCN, don't complain for GPUType=AUTO
clarified "no loader found" exception
Added all design elements and ready for live
generate nums only
max keys 20k
RSpec Config
Revert "fail test"

This reverts commit 7b426bc045127b842135ecb1f923174bc260dd84.
Added the skeleton of a "new site" sheet.

No, it doesn't do anything.

I *totally* haven't had these files just sitting around for the past 2
months. No way. I would NEVER do that.
Fixed CMake files for GLES building
Merge pull request #13 from bzar/master

CMake fixes for GLES building
[0.5.5.134] Use reminder in unit motion calculations.
A much shorter algorithm.
Reverted the character checking to minimize function calls.
Fixed it such that the Weekly planner shows actual date, and linked Todays' Exercises to the weekly planner.
Linked Today's Exercises to Weekly Planner
Removed extraneous imports
Update src/com/codeorb/myisle/OtherListener.java

Miner change
HONEYDCONFIG: Fixed support for honeyd script add/removes
CSS styles from cubism
Initial HTML for cubism charts
First git commit
Velvet 0.7.16
Velvet 0.7.16
Version 0.7.17
Velvet 0.7.18
Velvet 0.7.18
Velvet 0.7.19
Velvet 0.7.20
Velvet 0.7.20
Velvet 0.7.21
Velvet 0.7.22
Velvet 0.7.23
Velvet 0.7.23
Velvet 0.7.24
Velvet 0.7.24
Velvet 0.7.25
Velvet 0.7.26
Velvet 0.7.27
Velvet 0.7.28
Velvet 0.7.29
corrected feature path
Release of com.dexels.navajo.resource.mongodb version 1.0.3
Development stream of com.dexels.navajo.resource.mongodb version 1.0.4
Added INSTALL.rst
commit add index.php
Fixing dependencies
Gemfile.lock added
sensord: added watch thread for new so plugins

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
sensord: minor fix in walk dir

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
make: make with -rdynamic to export syms from sensord

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
sensord: general fixes

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
updated builtin_ping to use configd
Fleshed out file class

Basic logic added for all methods
Oh god this feels like java
Add to packagist.org
eliminados varios
actualizado la lista candidatos y el el test de listacandidatos
a.get('href')
adding patch for usb hiddev

Also cleanup of patches to utilize defconfig sources

reduced the bubba3_defcongih to always use savedefconfig
Reduce bubbatwo_defconfig to defconfig format
fixxed buggs with index in tsp tour
ffv1: Fix warnings about incompatible pointer type and discarded qualifiers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zmbv: Fix warning about discarded qualifier

Based on patch by: jamal <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
aviobuf: Fix warning about discarded qualifier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
new feature for RouteMatcher
ufeeds
Refactored database classes and tests
Merge branch 'XMSHistorie-database' into dev
forgot this forEach, replaced it with tire.each
keysyms-update: Add deprecation guards to the deprecated header

We still need to add them in case the header is directly included.
Update keysyms headers
Updated Belarusian translation.
grid-layout: Fix attach position for horizontal orientation

Switch the attach position. A new child should be positioned right of
it's previous sibling in ltr mode.
grid-layout: Insert new rows/columns at the appropriate position
introspection: assorted annotation fixes ported from Vala

https://bugzilla.gnome.org/show_bug.cgi?id=677778
timeline: Emit last ::completed before ::stopped

The ::stopped signal should be emitted at the end of the Timeline, after
the last ::completed signal emission, in order to have a proper
chronological progress of signal emissions:

  started → new-frame → [ ... ] → completed → stopped

This way, ::stopped can perform a proper teardown of the state set up
during ::started, without interfering with the potential cyclical
emission of ::completed.
docs: Mention the Timeline::stopped signal in the class description

Now that we have the ::stopped signal, it would be good if the
documentation mentioned it explicitly as the dual of the ::started
signal.
Hours worth of progress. Re-Implemented all error checking using REGEXs and counting is working. Still needs load_coaches load_teams add_team(not all the way) and the search features.
public#index
Updated readme with plan of action
added ubuntu-restricted-extras and couchdb
New example

A test to see if it was possible to recreate the result of Issue #7, if
not the cause.
And a demnostration why the author of the script calling zip needs to be
dilligent not to add extra characters to the output.
Updated ggggc.
Fixing output in runtests when there are test failures.
_FORTIFY_SOURCE, enabled by default on some distros, breaks strings in objects.c
Added some stuffs
Some more bug-fixes
simply configuration
Improve MissingLootFrame.
Got basic game 'mode' done.
post/clear_unread: return ok
step by step...
added fractal geometry for a 4x4 vector without proper visualization.
Much more work needed...
Use numbered lists in quick start guide

Not all flavours of Markdown support lettered lists, but all do support
numbered lists. This changes to the later, so all Markdown processors
will render the document properly (incliding Github).
Adding VaR Test Cases

Adding test data and sample pdf output
Merge pull request #2 from mboraiah/master

Adding VaR test cases
Agrego una vista que sirve la imágen directamente.
Guardo el mensaje como metadatos del QRCode.
Vista de detalle más útil.
Derp.  Forgot about that dependency.
add #/usr/bin/env python to all python files
Merge pull request #179 from cuda-geek:usr-bin-env-python
manifest: fetch Trebuchet

Change-Id: I0498b29936eaacc34d7b0f02d5dc77e1f8990816
Rezound initial setup
Speed up sync
Changed the whole permission system
Use git:// instead of https:// on prototype_legacy_helper
Merge pull request #493 from lkysow/gemfile-fix

Use git:// instead of https:// on prototype_legacy_helper
Now the environment.rb file checks for local_environment_override.rb to use for
environment variables that are specific to the current user.
Merge pull request #492 from rvlaicu/add_local_environments_override

Now the environment.rb file checks for local_environment_override.rb
Moved the call to load from local_environment_override
Merge branch 'master' into add_local_environments_override
Merge pull request #496 from rvlaicu/add_local_environments_override

Add local environments override
Flash messages for sections list active record save/update errors.
Moved helper from view to application controller and cleaned up code
Fixed flash tests
Using path helper to form redirect url
Merge pull request #497 from lkysow/issue-442

Using path helper to form redirect url
Merge pull request #498 from lkysow/issue-443

 Show active record validation errors in flash messages for Sections
Added contributors to credits
Merge pull request #505 from benjaminvialle/Contributors

Added contributors to credits
Closes #264 - add the possibility to edit sections while editing students
Added functional tests for #264
Fix: typo - missing colon
Prevent the database from too many queries
Fix: typo in translation
making sendToGraphViz compatible with Annes test for PA5
getopt grr :)
fix java_stubs attached to generators, refer classes via runtime
fix RangeCheck on adding root node with plain tabs opened
add deprecated annotations
review
fix choose by click or enter in model/module chooser dialog
review
ModelRoot ui editor extension point
add event listener to ModelRootEntry interface
fix tests
combine MPS.UI and MPS.Platform into MPS.Platform on MPS side
Merge branch 'master' into ui_module
fix tests
Merge branch 'master' into ui_module
Merge branch 'master' into ui_module

Conflicts:
	build/solution/source_gen/jetbrains/mps/ide/build/buildUI.xml
fix tests after merge
cosmetic changes
MPS-14806 Show Implementations is not working
scrpt to trim data (15 bp)
Test robot 1

Signed-off-by: JulienA <ju.aubert87@gmail.com>
fixed ReadString function
Too bad with QMessageBox we can't define interactive text setting

So we have mailto: or http and we can't call mail or browser.
=> Better to use a qdialog + qlabel.

I will create a patch for qt5 to add this feature in qmessagebox
twitter: fix for missing profile.
connections: drop stale events
[Issue #39] Fixed according to remarks
FindQt4: Avoid "finding" non-existent library in a .framework

...if the library file does not exist inside the .framework then do
not allow a library variable to be set to the path to the framework.
Force set it to NOTFOUND instead.
Merge topic 'fix-qt-dbus-on-mac-problem' into next

5c25df1 FindQt4: Avoid "finding" non-existent library in a .framework
iss751 bugfix: wiki: code-tag on line beginning
Bug: Fixed the exit codes for correct exit versus error.
Make login with 'letmein' actually work
Removed undocumented javascript requirement to publish posts
.gitignore vim working files
Relations to database, bug fixes
Using getJSON with callback to force JSONP from CartoDB.
Changing search sql api call to use jsonp.
Code formatting and cleanup.
Merge pull request #132 from MapofLife/feature/search-with-jsonp

Feature/search with jsonp
Fixing red list counter in list tool.
Adding reset button to styler.
analysis of results from hybrid analysis
added some testing of hybrid code
Fixes, so these work for ienv = 0
running calcs again in parallel mode
running calcs in parallel mode
new approach to parallel solution of HF problem. Seems to be working.
Increased HF tolerance (eps and maxit)
minor change in what is calculated
Merge branch 'master' of git@github.com:djyaron/msqc.git

Conflicts:
	multihybrid1.m
Model3.addH2modOffDiag was adding modifiers that were all on same atom. This is now fixed.
Minor changes to support timing and profiling
Merge branch 'master' of git@github.com:djyaron/msqc.git
Evaluation of H1 and H2 is now done in the parfor loop. Not yet tested on a matlab pool
Merge branch 'master' of git@github.com:djyaron/msqc.git

Conflicts:
	@Fitme/solveHFparallel.m
	parallelTime.m
fits with E2 fixed
Merge branch 'master' of git@github.com:djyaron/msqc.git
latest timing scripts
Debugging the fitting
slowly adding the parameters
Merge branch 'master' of https://github.com/djyaron/msqc.git

Conflicts:
	@Fitme/Fitme.m
	@Model3/Model3.m
	multihybrid1.m
sites enabled
asumx and normx families
Fix #257 by removing add_settings
Fix position size and category_of
remove duplicate definition of 'dot'
added relay of image_pose_id
Merge branch 'master' of github.com:Mobots/mobots
Grid and DB
added meta for fb
Reduce the 'blank' visualiser framerate to 1fps as a temporary fix for the ridiculously high CPU usage of a visualiser than should use next to no CPU at all.
(cherry picked from commit f2e29bb1102d1f77e514cd7b0f8f87fad457f285)
Fix the potential deadlock in starting logging

Seems the real issue is that I'd locked the queue around the new statement,
which is unnecessary, and causes the use of the queue mutex in the LOG() to
gack.
Fix the 1299 DB upgrade (DeletedMaxAge update).

The 1299 upgrade modifies DeletedMaxAge for its new meaning, now that
AutoExpireInsteadOfDelete is always enabled.  Previously, 0 meant
"expire when out of disk space" and was the default value; but after
f78f9992 , 0 means "expire immediately" and -1 means "expire when out of
disk space."  Both before and after f78f9992, any positive value means
to expire recording files that many days after deletion.

However, the setting DeletedMaxAge was only ever written to the database
if the user enabled AutoExpireInsteadOfDelete (triggering the
DeletedExpireOptions TriggeredConfigurationGroup) and modified
DeletedMaxAge to some value other than its default of 0.  Therefore,
most users did not actually have a value for DeletedMaxAge in their
databases--whether they had enabled AutoExpireInsteadOfDelete or not.

The DB upgrade needs to change DeletedMaxAge to -1 if and only if
AutoExpireInsteadOfDelete is enabled and DeletedMaxAge has a value of 0
(or is still using the default).  Because of the condition on the
update, it did nothing for users with AutoExpireInsteadOfDelete enabled
but without a value for DeletedMaxAge in the database.  This resulted in
their systems changing from "expire when out of space" to "expire
immediately".

Thanks to Thomas Boehm and Peter on the mythtv-users mailing list for
noticing that their settings didn't carry over through the update.
Sparse basics
Update 3/0000/0032.txt
Merge pull request #851 from turex/patch-93

Update 3/0000/0032.txt
Added jdbc wrapper for clojere
Administrator added line 4
Add document about thumbnail.js + via.me

git-svn-id: http://svn.coderepos.org/share/websites/twicli@39150 d0d07461-0603-4401-acd4-de1884942a52
PRIAM-66: remove bad script references from FakeConfiguration
Merge pull request #79 from jasobrown/master

change call to unexistent script name in FakeConfig
typo, readme update
Autogenerate screenshot for images
openjdk: Don't use the official build system's boostrapping, do our own.

The openjdk BOOT_CYCLE bootstrap doesn't use the binaries built in the first stage for the second stage, so we get a bunch of errors like:
  /bin/sh: /nix/store/wdgl7xl9b72hn212l0672ad5sn7vh44y-openjdk-bootstrap/bin/native2ascii: No such file or directory
Instead, just build each stage as a separate derivation
Zacel pisat predstavitev za v sredo
Le protocole d'authentification est fixe.
Modifitication de type de projet.
Added multitasking, added memory management
Генерация и размещение многих плиток для карты

Но пока что без выбора и перезагрузки _нужных_ плиток.
Add missing files to development branch

Missing files from Alajarvela style
Clean up small problems
vAsm-2.0: more C++11 work (move semantics in the parser, range based loops everywhere) and some step in memory leak avoidance

Signed-off-by: Nicola <ben.vighy@gmail.com>
vAsm-2.0: fixed memory leaks (mainly due to the optimizer)

Signed-off-by: Nicola <ben.vighy@gmail.com>
add version to requistion item json in order to compare versions
protection from loopy loops
Removed dwm stuff from this repo
Added constants for Messages
Merge branch 'master' of https://bondeulv@github.com/Proj11/Proj11.git
add tinymce 3.5b3 submodule
Website: removed most of the community pages as they are now on the landing site
resize a single image does work now. added a helper class for saving stuff to clear the applicationmanager.
Se arreglan algunos fallos y ahora los bots se actualizarán incluso cuando el usuario está en la administración.
Se mejora el tiempo de carga.
Se actualiza la clase Debug.
some changes style changes
add validation in post message in dashboard

add validation in post message in dashboard
Fix for step arbitrary allocation with hostlist from job's env vars
Change salloc stdout/err for batch program to /dev/null
Set SLURM_NNODES and SLURM_NPROCS for srun combined alloc/launch
Changes to cube_statistics.rst, copied from PR.212
Proposed re-wording in cube_statistics.rst
Merge pull request #263 from pp-mo/old_doc_changes_2_docs_cubestats

Changes to cube_statistics.rst
simple object deletion
make TeacherContestController derived from ProgrammingContestController
inactivity-timeout=600 maximum-requests=1000 in apache-site.conf
more installation notes for Ubuntu
state clearly that Filetracker server is not mandatory
rework docs
extend autoupdater
clean up pod, get rid of the unimplemented int types (mark as reserved)

Also changed the semantics of the high bits of the version byte so
they are ids and not flags. (If we want to mix types we can do so
anyway, but flags restrict the possibilities too much).

This also hopefullly eliminates some magic numbers.
- Item und Game.java aufgeräumt
adding gamvas 0.8.3 and box2d
convertTo*() methods
Merge pull request #77 from stanistan/convert-to

convertTo*() methods
LAMP: update slapos.cookbook version
version up : poppler-0.20.0.
STYLE: update links to pubdb for brain and knee atlas

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21496 3bd1e089-480b-0410-8dfb-8563597acbee
COMP: Prevent confusion renaming "python_patch_step.cmake.in" into "python_patch_step_unix.cmake.in"

git-svn-id: http://svn.slicer.org/Slicer4/trunk@19718 3bd1e089-480b-0410-8dfb-8563597acbee
COMP: Prevent confusion renaming "python_patch_step_pythonrun.cmake.in" into "python_patch_step_win.cmake.in"

git-svn-id: http://svn.slicer.org/Slicer4/trunk@19719 3bd1e089-480b-0410-8dfb-8563597acbee
COMP: Ease future maintenance by re-organizing content of python_patch_step_win.cmake.in

* Rename variable "python_CONFIGURE_COMMAND" into "python_PATCH_COMMAND_ONE"

* Rename variable "python_PATCH_COMMAND" into "python_PATCH_COMMAND_TWO"

* Add comments

git-svn-id: http://svn.slicer.org/Slicer4/trunk@19720 3bd1e089-480b-0410-8dfb-8563597acbee
BUG: more fixes to make sure editor widget can be used outside Editor: import vtk and check for existence of helper before accessing it


git-svn-id: http://svn.slicer.org/Slicer4/trunk@20848 3bd1e089-480b-0410-8dfb-8563597acbee
Fixed ending of page layout not ending correctly
search is still broken
fixed operator->matrix mapping
added updating to README
added gnu_nntp and JavaMail libraries
调整登陆窗口
Edited readme to be my own
VBS.pdf
Bug Fix & Anzeige der letzte Einzahlung ins Stammeslager bei Bedarf
Проверка на существование типов
Add test to reproduce #2631
Better to have a passing test even when there's an exception
Merge pull request #2646 from dcolish/develop

Add test to reproduce #2631
Change the systemd scripts to use simple instead of forking
Single quotes and .format
Update master template with new paths
Update minion conf template with new paths
Update default master and minion configs
Add migrate.py
rename file
Import migration util. Test it now
delete migrate.py
add master option to path migration
move migrate_paths before parse_args
some test changes
Start moving items if they exist on old path.
remove old migrate.py
Add file migration logic
Remove extra colons
Add mission parens
Ensure fast forward to current time happens before initial data request when subsequent time setting is Jump
ECB added
First successful ingest into solr: rake ingest:ncamafa works! Next step, adapt solrconfig.xml; map changes in catalog_controller.rb
First successful ingest into solr: rake ingest:ncamafa works! Next step, adapt solrconfig.xml; map changes in catalog_controller.rb
Faq re file permission override and FS_CHMOD_*
half of votes implementation
Fixed a ton of things, 1/2 of Item DB done.
added book Java Concurrency in Practice
basic project listing implemented
Ajout de certain fichiers
Merge https://github.com/Yw0ke/Symfony
README contact link change.
manual case class equals, hashCode and diff
findTypes
schema context test fix
toString with parens, field copy copies annotations
definition copy fix
collections with wrapper elements (toXml fix)
rename def and field copy annotations as well
rename/copy fixes for annotations
wrapper elements for complex types fix
using guava 13
manual case class hashCode/equals/toString
Merge branch 'dev' into wip
manual case class fix, list and map added as potential keywords
pretty print to width 120, not 20
nested container elements support
using local git repo in pom
[maven-release-plugin] prepare release porpoise-mapper-0.2.0
[maven-release-plugin] prepare for next development iteration
cache java, property and enum names in Field, also cope with fromTemplateXml having children with the same name as the container (e.g. case class Thing(thing : String))
dont output children comments in toXml template
want to pull to read about window and state machine
Merge branch 'master' of https://github.com/aberke/ip_tcp
Added support for @@

Addressed issue #137
Fixed up a bug introduced when implementing yank into registers.
Add incsearch option and allow for search/ex command in visual mode.

Addressed issue #109
Fix a few typos in README
Merge pull request #149 from wezm/patch-1

Fix a few typos in README
Merge branch 'refs/heads/Shuichiro'
http: add parsing support for sdch content encoding
improve http test suite
@= trying to delete submodules
Se agrega plantilla de administración.
Renamed bundles.
Removed a useless reference to $layoutContainer

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>
Refactored the grid code to gridbuilder module (separate d.o project now) and to the breakpoint functionality (still included with this module)
Merge branch '7.x-1.x' of git.drupal.org:project/layout into 7.x-1.x
Introduced a grid overlay to the region preview.

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>
The grid overlay now expands.

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>
Merge branch 'refs/heads/7.x-1.x' into gh-pages
Expanion of example 1

Expanded the example 1 to include services to show the real use of the ORM
in coding and ease of use in development.

Signed-off-by:  <adarshakb@gmail.com>
Fix some unconsistencies on CalDAV client
Add new CalDAV library (still WIP)
Start using new CalDAV internal library
Add new CalDAV logic to User library
Set User-Agent
Use new CalDAV operations library in caldav2json controller
Make own calendars work again
Load new CalDAV operations library instead of the old one
Remove static client, use a private one
Make events work again
Fix event href after moving/resizing it
Add ctype requirement (closes #57)
Add ctype extension check to configtest.php
Generate public calendar URLs
Load shared calendars
Apply more fixes to shared calendars
Fix shared calendars properties modification
Add XML header declaration
Use configured authentication method
Empty last response on CalDAV client

- Adds URL to check method
adding some debug options to stylus compiler, don't seem to be working yet, but not breaking either.
small refinements to readme prep for version 2 release
fixing readme typos - add jqery templates removal note
Better size when rehashing.

At least, the Boost documentation says so.
Conflicts:
	sdd/mem/unique_table.hh
add z-index for images
Add useful and transform slides
[Dev] Corrected a bug in json flight date array.
Merge branch 'trunk' into releases
[Doc] Added a new dependencies diagram.
Merge branch 'trunk' into releases
making dicepane into its own object
we'll see how that goes...
Replacement updates
Clean up
Merge pull request #26 from ajaxorg/fix/search_ui

Fix/search ui
ermagherd kitty kats
Merge branch 'master' of https://github.com/akonya/hacKSU
Fix resize issue in IE8 & IE7.
Skeleton API

A small beginning publishing a small selection of the RSR models

[#21]
Add tastypie to pip requirements

[#21]
Merge branch 'develop' into feature/api
Extend the API with more Location resources.

[#21]
Extend the API further

Add OrganisationLocationResource
Limit all resources to http method GET

[#21]
Fix broken organisation link
Corrected the markup syntax.

Fix #49
Add distinct query string variable to project_location resource

When retreiving filtered datasets using djangos ORM query language the
returned data may contain duplictes. To remove these add "&distinct=True" to
the query string.

[#21]
Merge branch 'develop' into feature/api
Merge branch 'feature/api' into develop
Hack to demo API use for maps

[#21]
[#9] Updated pip requirements for system packages: removed the supervisor and meld3 package specs until we actually need them.
[#51] Updated pip requirements for testing packages: py -> 1.4.9, selenium -> 2.24.0, splinter -> 0.4.5, lettuce -> 0.2.5 (all maintenance updates).
[#9] Updated pip requirements for system Python packages and deployment packages: virtualenv -> 1.7.2, virtualenvwrapper -> 3.5, simplejson -> 2.6.0, Fabric -> 1.4.3.
[#9] Updated pip requirements for RSR dependencies: django-rosetta -> 0.6.8, added latest commit hash for djangoembed, simplejson -> 2.6.0, Markdown -> 2.2.0, gunicorn -> 0.14.5 (all maintenance updates).
Merge branch 'develop' of github.com:akvo/akvo-rsr into feature/python27
adde right pmatchjme
Facebook integracija
Split now works too
Fix MANIFEST, materials were renamed to regions
Dynamic extrusion width for better gap filling
Merge branch 'master' into dynamic-flow

Conflicts:
	lib/Slic3r/ExPolygon.pm
Merge branch 'master' into dynamic-flow
Merge branch 'master' into dynamic-flow

Conflicts:
	lib/Slic3r/Flow.pm
	lib/Slic3r/Layer.pm
Merge branch 'master' into dynamic-flow
New faster algorithm for filling gaps, while we work on a new medial axis implementation
Merge branch 'dynamic-flow'
MB-5307: updated ns-server-hierarchy.txt

Change-Id: Ief560ac715f9ed12a346e273e795a3de397b8df9
mark

Change-Id: Ibdff80e7fcb12c21ee86fce6d9f731441ff4c923
amend

Change-Id: Iea5a44397277d6dc9a6bed6ff6ff7d665f34d089
mark

Change-Id: Ic416a3065a346b998a0f2743f0bb95798c3b059b
mark

Change-Id: If3f9db29bb64a892c98b507d5cd62674302413b0
mark

Change-Id: I6316b6a0d08b160d40169ba73e8896266794c3f6
amend

Change-Id: Ieac67f5eb201df24ce1ef9ef35d0632da7fd6a8a
adjusted mover for no bucket type and no wait_added call

Change-Id: If4976f2173ce8473b177c7e6d1571820f942d772
mark

Change-Id: I41c98b4d82459f664cf884692aee82e520a9fa2c
mark

Change-Id: I3347730c5ee6367a69d7d375519d1f3b17ef79e4
mark

Change-Id: Ie97f512f143eac6b5139eeb4201e07ceb668b96d
mark

Change-Id: I0d77a0c644e6add16f020b78b8ae9be1197b8500
mark

Change-Id: Id62613c402cf26d08bf46ebecfe3131269c64247
mark

Change-Id: I75104a5e1c6b03c61bb037db2c9acfeab9755b06
mark

Change-Id: I7bf15b399a40c3ccdd1eae12ec562bb2d7f67612
mark

Change-Id: I81b46b355953bf5c80268783d6d1c0c0a734d301
mark

Change-Id: I54da52a26ed2464b0551aea82ca17d3677d7fed5
mark

Change-Id: I0402fb487da76214b0b77cf6137e490d01f03b6e
mark

Change-Id: I33142a4e9a4df04ca6dd1272bdff531007f916fd
mark

Change-Id: Ia75544ce88a7918fd987603aa204d20c95e5da07
Merge branch 'dev' of github.com:vi4m/ralph into dev
Merge branch 'master' of https://github.com/allegro/ralph into dev2
Efficiency improved for impact calculation - embed type into graph
Efficiency improved for impact calculation - embed type into graph
Added label for 3rd relation
Check impact link for subnodes added
Merge branch 'master' of https://github.com/allegro/ralph into dev2
Drafts
Merge branch 'master' of https://github.com/allegro/ralph into dev2
Tear down exceptions for already registered changes
Updated tests for impact management changes
Last touches
Initial asset management models and structure
Merge remote-tracking branch 'vi4m/assets' into dev2
Merge branch 'assets' of https://github.com/vi4m/ralph into assets
Fixes
Fixes
Fixes
assets models
merge
Cleanup PKCS15 PIV Card PIN flags

If PIV card Discovery Object is present and Global PIN is preferred,
turn off the LOCAL flag.
Merge pull request #11 from dengert/staging

Note about using 'local'/'global' flags by OpenSC
http://www.opensc-project.org/pipermail/opensc-devel/2011-December/017525.html
Setting usage flags for the public key when storing a private key
Changing default usage from sign to verify, because verify is the public key opposite of sign for the private key
Merge pull request #5 from marschap/doc-for-staging

Doc updates for staging
Fix compiler warning and real problem

openssl.c: In function 'sc_pkcs11_verify_data':
openssl.c:384:19: warning: 'pkey_ctx' may be used uninitialized in this function [-Wuninitialized]
openssl.c:325:16: note: 'pkey_ctx' was declared here
Merge pull request #14 from LudovicRousseau/master

Fix compiler warning and real problem
Merge pull request #15 from LudovicRousseau/master

Fix
Display the ASCII equivalent of a hex dump

The output format of a hex dump has changed from:
    668C045A 1C3A4EF4 CF8550F3 20926525 1E8BF478
to:
    00000000  66 8C 04 5A 1C 3A 4E F4 CF 85 50 F3 20 92 65 25  f..Z.:N...P. .e%
    00000010  1E 8B F4 78                                      ...x

Is it now possible to find text strings inside a hex dump
Adding default accessflags to the do_store_private_key function in the same way do_generate_key has those accessflags
This seems the right thing to do, when you look at the initial commit which added the flags in do_generate_key and the ticket
http://www.opensc-project.org/opensc/ticket/198

Currently when storing a key, the accessflags are not set
Merge pull request #18 from LudovicRousseau/spy

Display the ASCII equivalent of a hex dump
Merge branch 'master' of github.com:LudovicRousseau/OpenSC
libopensc: Don't fail to allocate memory when mlock fails

 * Print out warning when mlock fails, and continue.
 * The warning required a ctx to be passed in, so that means
   changing a few function signatures.

https://www.opensc-project.org/opensc/ticket/389
libopensc: Add 'paranoid-memory' setting for behavior when mlock() fails

 * Setting paranoid-memory to true, and mlock() fails, then
   allocations which require non-pageable memory will return NULL
Reformat: remove extra spaces and tabs
Merge pull request #20 from LudovicRousseau/staging

Staging
pkcs11: win32 compilation error

pkcs11-display.c(139) : error C2275: 'CK_BYTE' : illegal use of this type as an expression

Signed-off-by: Viktor Tarasov <viktor.tarasov@gmail.com>
pkcs11: coding style

Signed-off-by: Viktor Tarasov <viktor.tarasov@gmail.com>
Merge pull request #21 from viktorTarasov/staging

Staging
Fix lookup_enum_spec() prototype

A change introduced in c0072d16ddc7b52d2b2c3c53991f569dcac45b3a made the
compilation fail:
pkcs11-display.c:738:1: error: conflicting types for 'lookup_enum_spec'
pkcs11-display.h:64:13: note: previous declaration of 'lookup_enum_spec' was here
Binary doesn't really belong here anymore
Implemented support for hive.map.aggr.hash.min.reduction in GroupBy
Add script to be run when attaching monitor
Move tinting stuff to its own file
Add cstrike
wmaker restarts with SIGUSR1, remove nitrogen call
fix what gets killed
another fix
supertab added to source control
Fewer unnessesary objects in database aftertesting, fix
reverted a braindead memcached timeout
* create redmine client lib.
* add login skeleton.
* add platform specific build.
moving this to ssh/hosts
making F5/F6 run the script currently being edited
adding terminal overrides
Basic webgl website with node backend
amended configure script to change permission
Added a convenience function to get  the last  item in an array
Added a function for traversing a dictionary
Handled a couple of edge cases
Added a length param to the string constructor
Cleanup
Added a JSON parser/encoder
add phpunit
plus de config en global
Merge branch 'master' of github.com:apuyou/ginger
waiting best song
search fix
font-size
song title; height fix
Merge branch 'master' into nativechrome
"trigger" instead "fire"
rf
rf
mvc names rf
extend func
Merge remote-tracking branch 'origin/master' into btapp
* Start and Stop commands
= -> ==
Merge branch 'master' of github.com:artjock/jpath
Работа над отзывчивым дизайном главной страницы
games-rpg/arx-fatalis-data: Update verify script
Bird edit
/which/command -v/

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
added draft_01_main.html
Merge branch 'master' of https://github.com/asvsot/slice1 into develop
Check in the old code.
protocol/inspircd-aux: add support for server-side MLOCK

(as implemented on by 'feature/mlock' branch for inspircd on github.)
protocol/inspircd-aux: add support for inspircd protocol revision 1204 (timestamped channel metadata)
Bump GLGeom version number.  Also remove unused XML generation from Doxygen.
заработал биндинг событий драг и дроп
working on the new rsync config system
Remove html (ico) files
update
Merge branch 'master' of github.com:baoshan/fairy
update
Docas.io synced with 08e6bfd
Imported Upstream version 2012.11.30
Rättstavade några kommentarer
Passage à maven
Correct property name.
Merge pull request #20 from basho/csm-fix-broken-log

Correct property name.
Make it fullscreen log for now.
Plugged in moq and started writing some tests at last
add vim-snipmate and dependencies
clean
fix bug : save image
sending email with housekeeping subject
More levels, a reset button, and a cheat to skip a level.
memo on re-designt
refined memo
a little bit of documentation (of ben's changes) and fixes to econtains/freebase
New RestService for SOC-2803
build: apport_vmlinux: be verbose
Updated reports based on code review feedback
First commit of VFW week 2 project files.
changed my css and js file names to style.css and main.js
changed file names
Fixed some mistakes from week one.
update
finished a lot of my css.
css update
updating my css
updated my css again.
Started my javascript file
fixed some things in my additem code
fixed some add item html stuff.
Set up my javascript set links
added js function makeOptions
made my storeData function javasript
javascript update
added displaying saved data js
added my toggle form function js
added my toggle form function js
added the words (scale 0-10) for rate my lover option.
Removed byte offset conversion, as it seems buggy.
Merge pull request #50 from fred-o/master

Remove redundant translation of byte offset to character offset for java search command.
minor SearchCommand cleanup post pull request merge
replace eclim/eclimd sed scripts w/ inline perl calls

getting the sed scripts to work properly on both GNU sed and OSX's sed
is too much of a pain, so just use perl.
element search default context to FIND_CONTEX + fix local references search
remove FIND_REFERENCES logic from FIND_CONTEXT since that breaks jumping back and forth from header/impl
only add type to qf/loc list entries in eclim#display#signs#Show

fixes #56 fugitive + :Glog + :cn
add exported attribute for buildpathentry element
update javadoc result urls for move to oracle
update php html results for html5 results in indigo
on c project create, for a reindex (not done by default as of indigo?)
fix :JavaFormat to not include one line too many
increase unittest heap size
on eclimd shutdown, stop system bundle + clean osgi config

cleaning osgi config should solve any issue caused by left over bundle
states. In the case of indigo, after an eclimd shutdown (headed or
headless) eclipse won't start without a clean due to org.eclipse.cdt.ui
trying to start before the workspace is available.
for indigo, pre-start org.eclipse.ui.ide so it can be started on the main thread

not starting it results in it being auto started on demand, but that may
occur off the main thread leading to an invalid thread access exception
update .classpath for indigo
update installer for indigo (3.7)
update docs for 1.7.0 release + move to eclipse indigo (3.7)
exclude compiled ng from tar

prevents skipping build of ng since the build script checks last
modified dates.
update <c-l> tree mapping to chain any existing user <c-l> mapping
the system is now able to build the smartc project. no clear or run support yet
update readme
bump package.json version
Actualizacion publicarMaterial adaptados a las nuevas tablas
implement building
add some test
Merge branch 'master' of github.com:bravado/bsync
Nova busca -- #22
update blat to subtract 1 from start since blat reports 1-based and features are 0-based
add .protein method
annotate takes an optional filehandle
add Feature._repr_html_() for ipython notebook. displays iframe of region
separate out some logic for mirroring
Minor updates (Windows & typo)

Add information for Windows' system console usage.
Also fix incorrect curly double quotes in code.
Fix quotes.

Fix single quotes in curly quotes in English text.
Add a paragraph to warn on single quotes in Windows system shell.
[fr] Windows quotes.

Add a warning on the caveats of using the Windows system console.
[fr] Typographical improvements

Use French double quotes, more unbreakable spaces,
   more long dashes, more ** around kept English terms, etc.
[fr] Fix some common typos
[fr] Use ISO format for file sizes
[fr] Rephrasing some sentences

Fast forward of the remainder of the changes from the other branch.
[fr] Fixing typos & some rephrasing
[fr] Ensure typo consistency of line endings

All lines not code nor empty nor image ref should end with a
   punctuation sign. Also join some split paragraphs.
[fr] Final fixes (hopefully)
[fr] Consistency: used *daemon* instead of démon
[fr] Re-add the faulty NOTES file, but with fake content

Presently, the content of the book is updated only when the files'
content is modified, but not when the file itself is deleted. So
to remove the content of the NOTES file from the site, updating its
content is needed.
Merge pull request #334 from PhiLhoSoft/CleanHistory

Improvements for fr (mostly)
[fr] Small fixups to the big rework from PhiLhoSoft
Merge pull request #335 from progit/small_fixes_fr

[fr] Small fixups to the big rework from PhiLhoSoft
Will work on better NERDTree navigation later
Centered writer and preview
Added images for An elegant app Part 1
Merge branch 'master' into gh-pages
added writing of reorder iterations for each cell
Merge remote-tracking branch 'upstream/master'

Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
Corrected typing pointed out by atgeirr in respose to pullrequest
Merge pull request #20 from hnil/master

Add writing of reorder iterations.
added writing of reorder iterations for each cell
Corrected typing pointed out by atgeirr in respose to pullrequest
Honour exact interface of LAPACK routine DGTSV.

The "MAT_SIZE_T" is not necessarily equivalent to 'int'.
Unequivocally exclude MATLAB timing printing.

It is not actually needed and prevents building when symbol
MATLAB_MEX_FILE is defined.
Honour exact interfaces of LAPACK routines.

The size type, MAT_SIZE_T, is not necessarily equivalent to 'int'.
Remove a derelict statement inherited from original implementation.

Disabled by default, this statement attempted to pass a std::istream to
function std::fclose() which is meaningless and should not be enabled at
any time--even for a MATLAB-related build.
Reference <grid.h> from canonical location.

The header was removed from this directory upon import from the
preexisting "opmtransport" repository.
Remove MEX support.

This has not been used in a long time, and actually prevents using the
module in MEX.
Simplify the logic to support --with-unit*=speciallib syntax

This change implements the approach of (e.g.,) ax_boost_system.m4, but
may lose some of the initial refinements.  In that case, we will have to
refine this code.
Expose the Boost library directory to the build system.

This enables explicitly encoding the directory, e.g., in the OPM-Core
run-path.  This, in turn, reduces the burden on library clients that
would otherwise have to satisfy library link requirements in addition to
any other link requirements they might have.
Encode Boost library location in OPM-Core's run-path.

Specifically, use the OPM_BOOST_LIBDIR variable created in commit
5c97e512 and Libtool's "-R" link-time switch to encode the library
location within OPM-Core's run-path.  This simplifies using the library,
because the onus of satisfying the library's link-time requirements is
removed from the client.

A second refinement puts the additional link-requirements (i.e., "-l"
and "-L" options) within the *_LIBADD primary.  This moves the libraries
from the middle to the end of the link statement.
middle.
Obtain Boost libraries from libopmcore.la .

Specifically, commit ff4f709e made the support for transitively
conveying interlibrary dependencies onto clients of OPM-Core more
robust.  As a consequence, we no longer need to explicitly link in the
Boost.System or Boost.Filesystem libraries to use the software contained
therein.
Merge remote-tracking branch 'upstream/master'
fixed filename date
Updated for streaming interface using parital application.
throw exception when unable to find matching delimiter
adding the_planner_and_plan_knowledge
Removed SQL thingies from ContainsExpressionBuilder
fix a few issues, package task, tidy up publish version & default ivy file names
resolve merge conflict
more pom gen updates, output test dependency modules with test scope, test-jar type pom dependencies
add ability to set pwd on Command's processbuilder
Updated use of cookies : now save lesson/step and lang automatically (not only from url)
Updated js file
Updated js file
Add `telnets` function to wrap `openssl s_client`

I keep forgetting the syntax and going back to the man pages when
trying to run manual requests against an https server. Time to fix
this problem for good :-)
changed section name
changed multiple selectors section to best practices
added multiple selectors section to best practices
added generic->specific section to best practices
added comments to best practices
added grouping to best practices
upgrade for vdm
__dir_rc type added
rcGen_cdist_single script added
support for backoffice-only manifest
addressing @drewfish comments during review. adding support for exclude/include on the perf config to facilitate analysis by focusing on one component at a time.
local strace
server and team tests
Got rid of white space in some places
cleaned up the admin area of tidypics
remote news feed for dashboard...
notifier read post
Fix for https://catami.atlassian.net/browse/CAT-124
Forgot to close a <a href> tag.  It added a link back to data/deployment to every object on the page.
aaaaaaaa
Merge branch 'master' of github.com:cbcbffr/learn
Fleshing out ep creation
make error messages more visible
Specify type of BSD License, and improve LICENSE file
History in contributors.txt
Removes the deprecated celery.backends.pyredis module
Remove copyright texts from modules
Use ' instead of "
renames worker.abstract -> worker.bootsteps
Remove old pythonproject example
More single quotes
Remove puts debug statement
Merge pull request #71 from celldee/remove_puts

Remove puts debug statement
Fix missing header file
Merge pull request #197 from markburgess/master

Header file missing from xml code
text align fix to video game trailers added
layout to display video content
added block to display video content in product
added run command to load video content layout
added list elements to display video game trailers
added content of 
Revert "added content of "

This reverts commit 14fdce35300e890260aef5357030f5c14e952560.
added content of create_homepage_list method, that returns list of products added to TRAILERS category
Application layout with partials
add rspec note
Revert "Use sep instead of ' '."

This isn't correct, as Jordan correctly points out.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164711 91177308-0d34-0410-b5e6-96231b3b80d8
Fix grammar of diagnostic message.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167319 91177308-0d34-0410-b5e6-96231b3b80d8
PR41111, PR5925, PR13210: Teach tentative parsing to annotate identifiers and
nested names as id-expressions, using the annot_primary_expr annotation, where
possible. This removes some redundant lookups, and also allows us to
typo-correct within tentative parsing, and to carry on disambiguating past an
identifier which we can determine will fail lookup as both a type and as a
non-type, allowing us to disambiguate more declarations (and thus offer
improved error recovery for such cases).

This also introduces to the parser the notion of a tentatively-declared name,
which is an identifier which we *might* have seen a declaration for in a
tentative parse (but only if we end up disambiguating the tokens as a
declaration). This is necessary to correctly disambiguate cases where a
variable is used within its own initializer.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162159 91177308-0d34-0410-b5e6-96231b3b80d8
Documentation cleanup: escaped # characters in Doxygen comments.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158614 91177308-0d34-0410-b5e6-96231b3b80d8
Introduce a new libclang API to determine the platform availability of
a given entity, so that we can tell when the entity was
introduced/deprecated/obsoleted on each platform for which we have an
annotation. Addresses <rdar://problem/11365715>.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156347 91177308-0d34-0410-b5e6-96231b3b80d8