labofsahil/github-event-dataset-2012 huggingface dataset:
Final CMakeList.txt for 10.5 configuration as default

Unless error I made, this is the minimal CMakeList.txt for a default deployment on OSX 10.5
We just have now to wait for the "8bpp PNG load" SDL bug fix to play solarus on this system.

I also add a few comment with the "OSX's Todo List" (don't know where to put it else :) )
Adding student logging in to server side
Dodaję vimrc
ajuste da tela de pagamento
mostrando dados dos 2 cartoes
Ich mag diese Datei nicht

Guten Tag, Nokipokidoki!
Fixed markdown in header
Add tests AnnotationPhysicalSystem, AnnotationObservableSet.
Added jQuery-hashchange, pulled from https://github.com/cowboy/jquery-hashchange
listo

ya quedaron los videos
added loop to assign PluginType within VBProjectManager, and set MakeActive for plugin with smallest plugintype
Imported Upstream version 0.11.1002045
update package camlimages : modifications on configure.ac and src/Makefile.am
Fixed typo.
Better error message.
#52 update render.js and sandbox.html
#53 update less.js make chrome app can load less
#54 update now brite
#55 change js to fix object model
basic functionality for fetching and appending stubs to the front page without rerendering dom
Doing some refactoring

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@134121 a5903396-d722-0410-b921-86c7d4935375
添加一个6200的recovery.img示例
[droid] upload icons as rgba rather than converting
[droid] make GetIconSize() usage more clear
[droid] don't list xbmc in android apps
add simple smtp send mail code in C
Fixed tests by using a new revision
Added support for certname and dns_alt_names
Autosign certificate requests.
Make sure autosign.conf exists

One could add more security by changing * to *.poetica.com or whatever
your domain, but I'll consider that in a future pull request as I want
this working.
Made autosign optional via env.loom_autosign
Corrected for truithiness
Changed namespace
xbps-query: fixed some issues found by pancake and valgrind.
Commenting out doc on log mutator functions as the feature does not presently work.
Merge pull request #591 from zhouyaoji/docs_remove_log_mutator_funcs

Commenting out doc on log mutator functions as the feature does not pres...
adding support for handlebars for the server runtime only for now.
cleaning up the handlebar wrapper for mojito as a view engine for the server side.
Added client side handlebars engine; Cleaned up jslint errors with server side engine
Issue #270: Added unit tests for client and server handlebars engines
Removed future jslint flag from hb client
Fixed PR comments
PR cleanup round 2
Made view engines asynchronous
Fixed client side HB renderer
Merge branch 'develop' of github.com:yahoo/mojito into handlebars3
Fixed jslint error in compile command
Merge branch 'handlebars3' into develop
Updated the windows dll project.
Added an extra include that seems to be needed for some iOS build targets.
OpenGLContext fix.
Added some speaker arrangements for WavAudioFormat. Removed a conditional in audio_devices.h
VST string encoding tweak.
Change to assertions to get Xcode 4 to work better.
Introjucer: improved handling of windows filenames when run on *nix.
Fix for OSX VST host windowing order problem.
Oops! Fixed a typo in the last check-in.
Version number bump.
Updated some win32 video code.
Tweak to the demo project.
Introjucer: added support for a user-code section to the AppConfig.h file.
Made the plugin host demo close its plugin windows before attempting to quit.
Added channel mask metadata to WavAudioFormat.
RTAS compatibility fix. Wav file fix for coping with corrupt files.
Merge branch 'master' of https://github.com/julianstorer/JUCE
view for privacy and failed creation
check for scheme in url
new translations
Node overriding test
add draft version of README.cmake.txt for both IlmBase and Openexr
include instructions to use cmake in windows
* cs_vert.ncl: use wrf_my_getvar instead of inbuilt and changed th to th_v
update CommonBasePresenter.php - helpers as macros

Allow to use helpers as a latte macros
Merge pull request #4 from iiic/patch-1

update CommonBasePresenter.php - helpers as macros (pull #4)
Reorganized vendor js
 Added skeleton backbone project
rename files to less obnoxious c++ things
基本编码
b
dfg
doc update

add a note on StateBase that derived class has to call its copy and
assignment operator explicitly
seperate tutorial material from source
Automatically delete eventually created publishing meta file
Sample order.properties for Publishing Taskflow
prettier loops and more return values
Use 6 concurrent test threads, since tests seem to hang at the moment
testopplastning
Merge github.com:0301/ordliste
Working on the projects model
Changed Meteor.call so that it uses a deferred style.

This:

Meteor.call('foo', function(err, results) {
  // callback
})

Can now be rewritten as:

var foo = Meteor.call('foo');

foo.done(function(results) {
  // One callback
});

foo.fail(function() {
  // Optional failure callback
});
distance threshold experimente, solution hat name
Added translation of Distance [km]
Added title translation also to dock report. This closes #167
Backwards compatibility working for old keywords.
PyCharm updates
Realtime: Log exception in the case that a locale does not exist
add home button to 404/500 nondebug error pages
update to make namespaced sequences work ^^
shooter tweak
converted to a dynamic page
add air_config file
Update to H2, to version 1.3.167
add sphinx document generation facility
adapt so 3to2 isn't seen by python 3 builds
adapt so sphinx isn't seen by build if not installed
Fix incorrect schema.
Note release.
Bump version for development.
Fixed issue with tasks sometimes not shown.

This happens when a model which has tasks playing is reloaded.
Fixed incorrect attachment rotation.

This happened when an attached model wasn't fully loaded at the time of
attachment.
Various fixes for the ember init script.

Handle multiple flags, use correct comparison, use generic shell rather
than bash.
Spelling fix.
Provide better help and pass on other options.
Removed unnecessary chdir calls.
Use layout containers.
Added ability to edit pose for attach point.
Bump to Ogre 1.8 and set version to 0.7.0.
Initial code for showing a config window at start.

We're using FreeGLUT and the OpenGL renderer from CEGUI for now. Might
be that this will be changed (perhaps using Ogre to show the Ogre
config?).
Added imageset for the splash screen.
Implemented fully functional config screen.
Use Ogre for showing the config window.
Better handling of SDL window creation.
Allow for loading without initializing.
Use the Ogre resource provider.

Instead of supplying our own.
Save config also.
чтобы не забыть
Add song: Oasis - Don't look back in anger
dotfilesHOME must be defined in .bash_profile
developero
developero
first nice start version
Changed 'Display Only Error Logs' to 'Supress Information Logs'
Rearranged the order of which classes load on startup.
More summaries for database functions.
Enhanced the performance of voltatile data operations.
Reorganisation of files

Organsied files into separate folders with some spring cleaning.
Add stripping Latex markup as user profile preprocessing #14
Mark a bunch of deprecated files as obsolete
git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@16966 b5f69653-2bf5-0310-8201-b0dafb8e1405
fixed close button background and preloader bg has 50% of alpha
pulled
assists updated, added tabs
Likely Last GView Update
remove getDataType2 function
Basic atlased texture support
Some initial work on listening for update requests over http
Merge pull request #13 from csainty/create

Create
Update lib/DAV/sftp/directory.js

Remove strict
add commit for PageHelper.ShowAlert
Make sure we sort correctly
add test for malformed setreg
bug fix for comments not showing up and urls in post comments
UI_WEB: Remove debug print messages
UI_WEB: Don't allow editing of the Doppelganger details in nodes

The Doppelganger is... special. 
Merge branch 'master' of ssh://helios/home/git/repositories/Nova
LIB: Change thinning distance in Config from int (bug) to double
QUASAR: Make sure StartHaystack has false as a parameter
Lib: Qt: Core: Saving Work Commit -HoneydHostConfig Exposure in Qt
Merge branch 'HoneydHostConfig' of ssh://helios/home/git/repositories/Nova into HoneydHostConfig
three more games
[cosmetic] minor README fix.
more invalid commands redeemed, some fixes to tron
navajo doc dependency bug
fix project setup
fix maven build for open source
Release of com.dexels.navajo.resource.jdbc.oracle version 1.0.3
Development stream of com.dexels.navajo.resource.jdbc.oracle version 1.0.4
Release of com.dexels.navajo.listeners.continuations version 1.0.6
Development stream of com.dexels.navajo.listeners.continuations version 1.0.7
Update step definitions for latest cucumber.
Handle errors.
Skip declarations located in other files.

Also added basic support for handling multiple input files.
Better handling of translating types.
Remove/move some invalid primitive types.
The "primitive" test pass now.
Fix the Objective-C class cucumber feature.
Fix the Objective-C "primitives" cucumber feature.
Move the Objective-C cucumber features to their own folder.
Fix some issues with translating functions.
Add shell script for running the tests.
Implement translation of function pointers.
Translation of typedefs.
Translation of structs.
Add cucumber feature for "struct".
Fix failing cucumber feature.
Add cucumber feature for converting methods.
Fix grammatical error.
Some refactoring.
Factor out common application code to new project.
23:50

It works :D:D:D:D
Fixed variable names and added test_storify.

The story predicate had variables G,A,S,W but the
test predicate used S,W with S mapped to A.
Working on the form validation
a test file that incorporates the bug fix
Making a light web installer
Updated DNS record
removed session middleware its now up to the base app to define it.
fixed bug in template. added empty path for root_types.
Implement a workaround for Erebot/Erebot#8.

This forces a second read when data is available on a TLS socket, so as to
avoid unread data and a subsequent timeout.
rtmpproto: replace strtok_r by av_strtok its unavailable in mingw

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: disable threading on mingw, it doesnt work due to dependance on internal code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
h264: fix parsing of old lossless profile (profile_idc == 144)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
xtea: fix unused variable warning for config_small

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MDL-34765 Course: Removed unknown constant when reordering
Fix for getFilterQuery() in dropdown element, was assigning non-existant
$label to $value.
Merge branch 'master' of ssh://github.com/Fabrik/fabrik
fixed: autocomplete filters were not taking into account the "Filter data:recorded data" option
Update lib/pdfkit/pdfkit.rb

fixed link to wiki page about installing wkhtmltopdf
Suppression des lignes vides :

- Suppression des lignes vides qui étaient ajoutées au tableau des
  lignes non écrites dans le fichier pur. Ça entrainait l'apparition
  d'un message d'alerte qui n'avait pas de contenu.
Correction de la page d'à propos :

- Remplacement du liens vers le site d'AdzHosts par la page facebook
  officielle de l'application (lien déprécié).
- Suppression de la phrase qui indiquait que l'application était a
  utiliser aux risques et périls de l'utilisateur.
Bump v1.11 -> v1.12
Merge branch 'release/v1.12'
Exercise

Added getNumberOfWorkouts()
Update LICENSE.GDFDL
Enhanced post-build script

- respect start/stop use cases
Merge branch 'master' of https://github.com/jps-networks/GDFDL into develop
Upgrade Passenger version to 3.0.17
quadtree: also store parent reference in each node so we can traverse the tree in force layouts and elsewhere where only the relevant quadtree *node* is passed to us: we'd want to traverse starting at that node then anyhow.
basic work on force layout: theta is now functor to allow optimized force layout calculations based on potential or force rather than just distance.
theta check should NOT be influenced by the alpha value (which slowly decreases to zero); the check should identify items which are *relatively* important, while alpha reduces forces across the board.
update raphael selection.data() to reuse default selection.data() code more.
working attr transition support for raphael.
make addClass Raphael extensions actually add class in IE.
update the manual raphael selector to handle classes.

I didn't bother handling anything more advanced than [type][.class]*
because of Raphael's hierarchy-less philosophy. If anyone tries to
select on anything more advanced the behavior is undefined, but it
wouldn't work in the end anyway.
use sizzle as the raphael selector engine when available.

Should run some benchmarking to make sure this really is
faster than the manual selector when I get a chance. Because
we have to trace through the Raphael object list to
reassociate dom nodes with Raphael objects, I'm not thoroughly
convinced that there is a performance benefit.
minor updates on raphael class selection code.
implement selection.remove() so that one can do .exit().remove()
Merge branch 'raphael-compat-2' into raphael

Conflicts:
	d3.v2.min.js
Merge branch 'raphael-transition' into raphael

Conflicts:
	Makefile
	d3.v2.js
	d3.v2.min.js
	src/raphael/selection.js
updating readme a bit.
update makefile so that it works with homebrew.
update gitignore for vim swapfiles.
change to improve perf in ie due to css getrules.
change to make it more evident what is not supported when something isn't supported.
first pass at getting .on() to work with Raphael event binding.
Merge branch 'raphael-events' into raphael

Conflicts:
	d3.v2.js
	d3.v2.min.js
	src/raphael/selection.js
Merge branch 'raphael' into raphael-socrata

Conflicts:
	d3.v2.min.js
remove in raphael isn't parent-based.
missed a name change in my refactor earlier.
Merge branch 'raphael-compat-2' into raphael

Conflicts:
	d3.v2.min.js
Update strings.xml, translated new strings and updated old string
Merge pull request #11 from GitBraK/master

inventory.simba Changes
Merge pull request #12 from GitBraK/master

Brak said it was correct
Merge pull request #2 from SRL/master

Pre Update Pull
JSFythe's handling of nested LanguageExpressions in Fythe was wrong. Fixed and added a test case.
Wrapping with statement only crucial parts of code. And some other improvements... I hope :)
App beim Klick auf Zurück-Button in Hauptmenü und Login schließen.
added to README.md, improved interface for incomplete expressions
Adding readme.
Raise error in a better way if User is not defined.
Adding generators.
convert CommonData to new cstruct
initial support for named globals
savegame support
warn if new variables are added during the loading phase
typo
editing shedule
adding cname.
glont
Added something, really slow progress..
Modify routes controller to catch any routign exceptions and turn them into 404s.
Log 404 errors seperatly, better 404 error message.
Fixes #184
Remove hardcoded utf8 charset.  This is different for different db platforms.  Leavt utf8 as the default.
Fixes #179
Block export of modified pages.
Fixes #177
Copied pages get a 'copy' status which prevents them from trying to recreated fixed elements.
Fixes #176
Update foundation.
Visibility in XML does not need a tripple equal.
Try to make things work again
build: plugin groups -> folders
build: reorganize dates build
build: simpify mps-dates; minor fixes
update build.mpr
build: add new buildlanguage into plugin; rename folder mpsbuild -> mps-build
[rename] README -> README.md
try to decode each fragment before saving it locally
Reader: update Sidebar skin after script update.

Gets rid of that annoying glitch on load/refresh, where mousing over the
items makes the new values appear before the rest of the skin clicks in.
[#36517455] delete default Rails pages
CMake Nightly Date Stamp
Change GT.M Coverage Parser global

The coverage global should be in the local namespace.  This means the global
will be ^ZZCOVERAGE instead of ^COVERAGE.  Change the parser to look for ^ZZCOVERAGE
instead of the old ^COVERAGE
Merge topic 'mumps_coverage' into next

1b418f1 Change GT.M Coverage Parser global
Merge branch 'master' into next
CMake 2.8.10-rc1
Merge branch 'release'
CMake 2.8.10-rc2
Merge branch 'release'
CMake 2.8.10-rc3
Merge branch 'release'
CMake 2.8.10
Begin post-2.8.10 development
Remove stray reference to bootstrap.
WIP: specify coverart resolution
Merge branch 'master' of github.com:KraYmer/beets
Allow pages and per_page parameters to be passed to Taxonomies
Add searching ability to API's TaxonomiesController
first sample how to load data from csv,
change lib from v2 to v3
For some reason it didnt compile mangosscript on linux (lol)
Testing how well this could work =)
basic ls and uptime
Merge pull request #3 from UnrealAkama/master

ls and uptime
-- Nice work Akama
refined only a bit
Fixing minor issue when CMAKE_REQUIRED_LIBRARIES ended up empty
Fix include guard in luadev.h
Restored modelviewer project to VS2010

Note: applied commonlibs.props
Move mysql initialisation to requests.py.
Always explicitly delete the mysql object.
SPLIT THIS SHIT UP! part 2
Merge branch 'master' of https://github.com/Makja/Mytunes.git
Moved to Github

Files and paths were adjusted to reflect the new domain.
adding s and t to geneig
fix previous wrong detection of fma4/xop and add sse1 detection
Fixed horzcat by making it forward to cat
some pb involving first ad second wih sum for integer tables
fix to simd reduction first and second
Worked some more on the temporary system
fix distribution bug
namespace convention
remove unneeded codes and files
Replaced type_t by Type whenever possible.
No longer depending on fasterflect, rewrote id property lookups using custom caching
card grabbing test!

grab with left mouse and release
spin with right mouse
Starting work on app framework. Changes to config.php
No sense leaving the other parameter in if its just getting ignored.
add convenient methods to change a state of an issue
Updated CSS structure
Minor optimization to not call identity.getSeeds() numerous time in the same method,
as each time it requires a call to the store where tokens are being kept.
Merge pull request #98 from jasobrown/master

Minor optimization to not call identity.getSeeds() numerous time in the same method
show order in product tables
Merge branch 'master' of github.com:NigoroJr/perl
Added some content files about Pokemon's skills.
remove entities array
Added a workaround for the default font crash
Merge branch 'master' of github.com:Oberon00/SFML
A bit more progress.

It's Yak Shaving Day, apparently.
Ajout certain paramètres pour la tabulation + détection type fichier + longueur max
cleanup requistion item
format expiration date in picklist item model
Vorbedingung, Endbedingung , Invarianten Excl: Band, GuV, Programmm,
Test
Fehlend: Bad/Good usw.
Terminato refactor delle funzioni di acquisizione delle impostazioni di
ambiente di gioco (var_env_init(), env_init())
replace moved to sugar actions
TODO updates
Parameterize Sugar constructs on Expression m
Sugar.atSubExpressions is fmap
Sugar.DefinitionRef -> Sugar.Definition
Simplify Sugar.Actions
Make codes more ECMAScriptlish
Merge branch 'experimental' of github.com:Pikaurd/feb28 into experimental
[202] Fixed a double arrow error in the ajax model :facepalm:
[127] Fixed a small bug, and removed the update method from the frontend controller
Enhance graphics.
Wire in static resources from slickgrid. No-egg package is checked out with mr.developer.
Flip renamed to Mirror, need to propagate to variables
Calculate more interesting properties
Initial steps for Ramaze 2.0.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
Remove the dependency on RackFileWrapper.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
Remove the dependency on RackFileWrapper.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
Use Ramaze.middleware instead of .middleware!

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
Fixed the directory dispatcher specification.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
Fixed the file dispatcher specification.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
Simplified loading of Rack::ETag.

Checking for the arity of Rack::ETag is no longer needed.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
fix middlewares
Fixed Ramaze's middleware handling.

Turns out that calls such as `self.app` (see the various commits I made in the
Innate repository) can be a bit of a pain. While Ramaze "mirrors" the various
Innate constants it would apparently create a clone of `Innate.app` instead of
a reference (maybe something else equally weird was going on though).

Fixing this was rather easy, after I found out what the heck was going on. I
removed `Ramaze.recompile_middleware` since it offers no benefits over
`Innate.recompile_middleware` as well as having changed a few references to
`Innate.app`. This along with the various changes I made to the Innate code
means that Ramaze now plays along nicely with Innate.

Since I'm currently on a plane somewhere high in the sky (insert Top Gun tune
here) there's a chance my way of thinking has gone wack. Because of that I'm
asking @manveru and @leucos to take a look at this commit for some much needed
feedback.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
New way of setting middleware.

Middleware are now set similar to how it's done in Innate HEAD.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
Merge branch 'master' of github.com:Ramaze/ramaze
jCrypt string encodings (ASCII, UTF7, UTF8, UTF16, and UTF32)
fixed recent file list handling
[git] Changed push default to upstream.
Use unsigned integers for all times

Playtime positions (for position and seeking) and track durations. It actually
makes things simpler!
Whitespace cleanup
Fixes for Glib 2.32

Glib 2.32 deprecates many old stuff related to threads, mutexes, etc. And it's
good!
Add method to get track image as a file name
Basic MPRIS2 support

This is far from perfect:
- the code produced by gdbus-codegen had to be edited by hand to avoid emitting
  a signal every time the position is changed
- settinv invalid values for properties resets the property to a valid one but
  does not trigger an error
- TrackList and Playlists interface are not handled yet
- some methods are not implemnted (OpenURI) or partially implemented
  (SetPosition currently ignores TrackId)

...but it's usable already :)
Merge branch 'mpris2'

* mpris2:
  Basic MPRIS2 support
  Add method to get track image as a file name
Update .gitignore

remove .gitignore file from ignore list
edited spiral out, which actually kinda works now.
New Formula: hashcat 0.41
Removed hashcat formula
uwsgi: add universal pcre requirement

Closes #15715.
smpeg: enable gtk+ test and point to sdl

This enables non-/usr/local installs.
Fixes #15517.
CImg 1.5.2

Closes #15722.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
teapot 2.3.0

- Upgrade to 2.3.0
- Switch to cmake because it's the only build system now.
- Add a dep on cmake.
- Add `-DENABLE_HELP=OFF` so it doesn't require latex.
- It still installs some man pages.
- It has an fltk option that doesn't work due to HB fltk issues.
- Works with superenv on ML with XCode-4.5.1

Closes #15720.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
rsyslog 5.10.1

- Upgrade to rsyslog 5.10.1
- It's old, but newer ones, v6.x or 7.x, require linux & sysinfo.h
- Add an explicit dep on pkg-config
- Works with superenv

Closes #15719.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
scrotwm 0.9.34

- Upgrade to 0.9.34
- Add a required dep on x11. It's an X window manager.
- Works well with superenv

Closes #15718.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
scrub 2.5.2

- Upgrade to 2.5.2
- Add a patch to add <sys/types.h> otherwise missing symbols
- Add a patch to make a non-void function return a `0`
- Add comments for the patch linking the upstream bug report.
- Works with superenv on 10.8.2

Closes #15717.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
tophat 2.0.6

- Upgrade to 2.0.6
- Add a patch: intializes variable length arrays to 1 for clang.
- Patch stops a variable length array non-POD element type error.
- Patch reported upstream via email and noted in comments.
- Add an LDFLAG for `-lboost_system-mt` because autoconf doesn't.
- Add a dep on boost because the build requires it and samtools.
- Works with superenv on ML with XCode-4.5.1.

Closes #15716.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
brew-update: Guard non-directory files in Taps

Skip any entries returned by `Dir["Library/Taps/*"].each` that are not
directories.
tophat: fix whitespace in patch.

Fixes #15726.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
berkeley-db: make java opt-in

Rationale: java is an optional OS X component, so don't try to build
with Java by default.

Nothing in core uses the java components.

Closes #14411.
bogofilter: style nits
little-cms: add option for Python bindings
sip: fix patch fuzz
Swatchbooker 0.7.3

Swatchbooker is a python program to view, convert and edit swatches
(colours mostly at the moment). It comprises command line tools and a
Qt GUI, hence the pyqt dependency. It requires little-cms to convert
colours and little-cms hence needs to be compiled with python bindings.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
graphicsmagick: --disable-openmp unless using gcc

Graphicsmagick's OpenMP support is disabled with clang, but it also
fails to build using llvm.
MonetDB 11.13.3

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
qxmpp 0.7.4

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Use aspect in selector to prevent clobbering of init/destroy
Paredaguotos diagramos
Merge branch 'master' of https://github.com/Skipbug/PSI-1
template -> instance rename
Merge remote-tracking branch 'origin/resiliency_annotated' into resiliency_annotated

Conflicts:
	stack/lamp/buildout.cfg
Merge branch 'resiliency_annotated' into lapp-resilient2
Make ca-certificates compile without patch command
Make openssl compile without patch command
Add patch to PATH
Merge branch 'minimal-toolset'
Add back compilation of lxml with slapos.cookbook.
Update flask stack
stick to Zope 2.12.22 because Zope 2.12.23's ObjectManager.__getitem__ is much slower for a module having lots of sub objects (same as d69b76ed55573355fa0112bf3471e6afbe477497, that seems lost by a careless merge).
provide postgres .pid file for slapreport
BUG: 1957. Fixed vtkMRMLSliceNode::SetUVWExtentsAndDimensions() to call UpdateMatrices correctly

git-svn-id: http://svn.slicer.org/Slicer4/trunk@19953 3bd1e089-480b-0410-8dfb-8563597acbee
! More keeping in sync with default changes
! tweak board index height

Signed-off-by: Spuds <spuds@simplemachines.org>
enabled MC cache again, plotting enhancements
Solves another problem with university summary.
Added config option to allow control of how statue spawn limits work.  Updated binary to work with new hooks.
Merge branch 'general-devel' of github.com:TShock/TShock into general-devel
Nota del proyecto 2 del grupo 27 que faltó tabular
Changed the segue's to modal instead of push. With push we need to implement a UINavigationController
Delete system().
Fixed Deprecation Message
Item list for tally list carry over is no longer hard-coded. The list
now contains all stockable items.
Ditched Chorewars plugin
Ration, option columns
Edit items, item change log
Merge branch 'master' into managableitems
Updating the WebSocket samples to v0.3.
Latest maxui
Style: Init glcontext to null in ctor and some formatting fixes.
add comment ajax + admin user + pagination
Fix for pitch/yaw/roll update in SpoutEntity

Signed-off-by: Victor Danell <victor.danell@gmail.com>
break python everywhere. (try to force cmake to detect version 2 instead of 3 to accomodate debian: ticket #1279 )

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6115 17fca916-40b9-46aa-a4ea-0a15b648b75c
more on "break python everywhere"

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6116 17fca916-40b9-46aa-a4ea-0a15b648b75c
workaround #1278

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6117 17fca916-40b9-46aa-a4ea-0a15b648b75c
more on "break python everywhere": upstream-suggested solution, let's see

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6118 17fca916-40b9-46aa-a4ea-0a15b648b75c
QApplication::commitData() is virtual, we're not supposed to call it.. ever; fix #1268

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6119 17fca916-40b9-46aa-a4ea-0a15b648b75c
fix for a crash.. in the tip module

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6120 17fca916-40b9-46aa-a4ea-0a15b648b75c
fix for #1262

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6121 17fca916-40b9-46aa-a4ea-0a15b648b75c
Update txnid-selfcheck test app to use the "statsfile" arg.
Merge branch 'master' into newrejoin
ENG-3568: Switch stream snapshot to use the mailbox system instead of creating a
new connection.
Switch blocking rejoin to use the mailbox system for data transfer.
Fix TestExecutionEngine.
ENG-3568: Clean up the interface in StreamSnapshotAckSender and
StreamSnapshotDataReceiver per Ryan's comment.
Merge branch 'ENG-3568'
Do not use size_t, use int32_t to avoid type conversion. Trim trailing whitespace
Add a static_cast from size_t to int32_t
Merge remote-tracking branch 'refs/remotes/intern/ENG-3019' into ENG-3019
Merge branch 'master' into ENG-3019
Second try at ENG-2914.
Still need to fix NLIJ and add a few tests.
Refactor: make sysproc fragments use runner's ES context

Now that the system procedure runner has an execution site
context reference, it can use it to run fragments and not
require the fragment task to pass the reference again.
Refactor: track sysproc frag ids in LoadedProcedureSet

Use the recently added LoadedProcedureSet to track the
system procedure plan fragments. Removes the hashmap
from the execution site.
Merge remote branch 'origin/master' into iv2-master

Conflicts:
	src/frontend/org/voltdb/LoadedProcedureSet.java
Fix regression with junitclass reporting
hide print btn
Readd inlines + fix wh
second mock, placing comments at the bottom so we aren't constrained by space
fixed missing semicolon
Merge pull request #18 from harakka/orbatnotes

Fixed missing semicolon in init.sqf
Merge pull request #5 from ferstaberinde/dev

Dev
test_run_glimmer: all tests pass except last two -- still no .orfs outfile
Player does not need vector
Fixed a bug in PropertyList
Passing a PropertyList to the Property constructor would not add the Property to the list.
Added SetProperty() to PropertyList
Cleaned up EntityManager
new api function to get design document view info
new version 1.5.4
better documentation for retrieving normal and temporary views
ssvd
Flush some modifications and additional tweak
Integration of funnel with baseframe.
Find external audio files, open corresponding inputStreams and store them.
Move page title download to new thread
cybercrime (ancora da fare)
e poi ci sono le valli che mangiano le montagne
Merge branch 'master' of github.com:acm-unitn/acm
Integrate grid builder and breakpoints with the fronted

- Make it possible to generate CSS for the backend and fronted separately with appropriate wrapper selectors.
Merge branch '7.x-1.x' of git.drupal.org:project/layout into 7.x-1.x
Changed the z-index of the grid overlay to 100

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>
Capturing progress on getting the region resizes to snap to the grid.

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>
Regions resize from the left and snap to the grid. Placeholder still need work.

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>
Added a mini-plugin to supplant classes on elements. Fixed the placeholder resizing.

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>
Merge branch 'refs/heads/7.x-1.x' into gh-pages
modificando acceso de session
Handle empty requires list when wrapping db.table.field.requires in IS_EMPTY_OR
fixed  IS_EMPTY_OR validator, thanks Adam Bryzak
fixed datetime-parsing
fixed some issue in grid with grid.create_form
db._adapter.reconnect()
reconnect commits first
fixed typo in gluon tools
gnuicorn -> gunicorn
LENGTH fixed in MSSQL, thanks Denes
fixed pickleablestorage import
gunicorn?
customizable personal group names
auth.settings.everybody_group_id
has_permission applies to everybody
fixed accessible_query
better response.files behavior
grid.create_form
Merge branch 'master' of git://github.com/mdipierro/web2py
added Matthias Strubel
Removed unused function
Fixed #7 cleanup mode added

This modes check for existing PID (based on forban_*.pid),
if they exist kill the PID and remove the PID files. If the
processes are not existing, the PID files are removed too.
Try to keep the portability by using the POSIX standard "Signal 0"
Deprecate Forgery dictionaries and formats methods

The Forgery::Tool is now base class for these stores. Maintains
be backward compatibility.
Enhance usart_read/write() api, and fix the serial example.
code editted, test for n_c objects added
cambios de schema ok
delete file
ingesting parametrs
test
ingesting parametrs
Merge branch 'master' of https://github.com/agroknow/AgLR.git
Bring stars in closer
Increase star system from 500 to 600
Actual solution to problem 88.
Fixed a bug: did not display the right leg or segment when selected in the inventory grids + Respectable inventory performance improvement
Merge branch 'trunk' into releases
Bumped jsFTP version number. It solves reconnection issues
code school vs post
edits
new edits
new push
title change
final edits on cs v
add content type only for POST PUT
2369 - bitrot in http server

We still can't write unit tests for it because we don't have threads.
2370 - explanation for last year's socket troubles?!

No, the webserver continues to work after this, but it fails to fix
commit 1238.

Hey, but commit 1247 now works as-is. What's going on?!
2361
Multiple updates including new landing page that explains some of the examples;

* customizable fit function through backgroundSize option

Signed-off-by: Aaron Vanderzwan <akv292@gmail.com>
Fixed add update form UI issue and made some syntax cleaning

Fix #83
Merge branch 'develop' into feature/add_update_error_39
Update BattleMap/OldGameViewController.m
[darwin/deps] - configure with --enable-upnp explicitly because xcode project needs this to be on (who knows if the default will switch over to disabled sometime haha)
[osx/ios/atv2] - sync xcode project
Merge pull request #3 from Memphiz/code-shuffle

Code shuffle - osx/ios syncup
Catch unknown command failures.
fixed name of config file in docs
Keep bridge flow unchanged even with the new overlapping spacing
Mat. 10:8
addded search
Now use qApp.arguments() instead of argc / argv
Metatag and user readonly modules
jira tickets should be handled only by cmdb_git queue workers
Merge pull request #276 from vi4m/master

Specify queue for creating tickets
Moved the share/save event handlers to the top-level view, so less listeners are created
Merge branch 'master' of github.com:alltom/hubbub
Compiled feedView.js
semicolons
reset button applies filter immediately
add newline at end of script
adding hiberate core and hiberate entitymanagement jar
new post, Simon Newstead
fixed handling of strtoul error
Fix translation process when embedding multiple objects.

Parent's attributes should not include embedded objects when embedding.
Merge pull request #9 from Pranas/fix_embeds_many

Fix translation process when embedding multiple objects
added calculator Exception
added calculator Exception
move NTriples result.length as it broke on oraclejdk7 on travis-ci
zsh: Homebrew wants sbin in the $PATH.
Simplified web site, added ViewVC link.

git-svn-id: https://svn.apache.org/repos/asf/roller/trunk@1425933 13f79535-47bb-0310-9956-ffa450edef68
prototipo home
Clean up unused lein tasks.
riemann.config is testable now!

Found and fixed a bunch of pubsub-related config issues from the switch
to immutable cores.
Fix race in channel query on client-side
Periodic 1D prism derived from polyhedron, minor structural changes.
Update protected/config/main.php
Исправления в модуле страниц: поле Сортировка наезжало на поле Статус. SEO-шные 2 поля сделаны необязательными для заполнения.
config/main.php rollback
Включена работа с префиксами.
small fix
исправлен баг в установщике + "глобальная" чистка кеша в установщике
продолжаю чистить год для корректной генерации языковых файлов
closed #329 + все файлы переводов генерятся корректно
чистка + маркетинг =)))
удален лишний файл перевода
Merge github.com:yupe/yupe

Conflicts:
	protected/modules/page/models/Page.php
Рефакторинг с пробелами.
Рефакторинг с пробелами. И удаление мусора от ГИТа...
Merge branch 'master' of github.com:Lexxtor/yupe
Merge pull request #327 from Lexxtor/master

Исправления в модуле страниц: поле Сортировка наезжало на поле Статус. SEO-шные 2 поля сделаны необязательными для заполнения.
merge fix
merge ref
enableCookieValidation теперь включен по умолчанию http://www.yiiframework.com/doc/guide/1.1/ru/topics.security#sec-4
исправлены лейблы
Update protected/modules/yupe/filters/YBackAccessControl.php
Tweaked the info on running in debug mode

Sorry for the repeated commits, but this wording seemed better, and
doesn't presume that running in debug mode means you should forgo a log
file.
fix create new task exception
Upgrade a range of gems in preparation for the 2.2 release cycle
Fix "Global access to Rake DSL methods is deprecated" warnings. issue #336

The cause of the warning is that the word "task" in machinist blueprints conflicts with the rake keyword "task".
Remove the "task" keyword definition before all blueprints definition fixes the problem.
fix typo in last commit
fix Rake undefined in spec test
Devise now needs an additional gem for encryption
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
refactor worklog - fix spec test:units test:functionals
fix integration test
don't create event_log if nothing changes
add suppressBilling to project
fix conflict merge ari/dev with liufengyun/dev
fix devise 2.1 update problem

https://github.com/plataformatec/devise/wiki/How-To%3a-Create-a-custom-encryptor
fix mark user active/inactive problem
fix test description of marking user as active/inactive
Add contributors file where acknowledgement of the license terms can be explicitly mentioned.
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
add service tip & isQuoted
show billable label
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
fix multi-line customer attributes display
Add "of" flag to ComprehensionBlock

http://code.google.com/p/esprima/issues/detail?id=359
Reject invalid shorthand object

http://code.google.com/p/esprima/issues/detail?id=360
Releasing 0.6
Bump to 0.7-SNAPSHOT
border radius and persistent state for headers
Backport #8522, Keep index names when using  with sqlite3

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
	activerecord/test/cases/migration/rename_column_test.rb
Merge pull request #8558 from senny/backport_3489

Backport #8522, Keep index names when using  with sqlite3
Serialized attribute can be serialized in an integer column

Fix #8575

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/attribute_methods/serialization.rb
	activerecord/test/cases/serialized_attribute_test.rb
	activerecord/test/models/person.rb
backport #8616, quote column names in generated fixture files

Conflicts:

	railties/CHANGELOG.md
	railties/lib/rails/generators/test_unit/model/model_generator.rb
	railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
	railties/test/generators/model_generator_test.rb
Merge pull request #8618 from senny/backport_8612

backport #8616, quote column names in generated fixture files
Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options.

Fix #8621

[Colin Kelley + Rafael Mendonça França]
Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options."

This reverts commit 93366c7c913bf0883f140fa782d3e198593477be.

REASON: This is backward incompatible. Also this behavior is documented
on the guides.
Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings.
Merge pull request #7718 from kennyj/fix_6962-32

[3-2-stable] Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings.
Revert "backport fair connection pool 02b2335563 to 3-2-stable"

This reverts commit 0693e079708a52b777f2b7872b8e3d467b880a0d.

Revert "Cache columns metadata to avoid extra while testing"

This reverts commit a82f1e3f5d11c8dfba9f4c911745ec40a7965216.

Reason: This is causing failures in the postgresql build.
See http://travis-ci.org/#!/rails/rails/builds/2485584

Related with #7675
Revert "Respect `config.digest = false` for `asset_path`"

This reverts commit 1ac19c11792a745cd654f02dfaed8e93f95b3c70.

Conflicts:
	actionpack/CHANGELOG.md

Reason: This is causing failures in the railties build.
See http://travis-ci.org/#!/rails/rails/jobs/2491787

Related with #7672
Explictly set the assets digest option to false
Revert "Revert "Respect `config.digest = false` for `asset_path`""

This reverts commit 54f55746a70a7091341e84236498203118a7fbb4.

Reason: the last commit fixed the failing case
Merge pull request #3544 from amatsuda/_field_changed

Rename field_changed? to _field_changed? so that users can create a field named field
Conflicts:

	activerecord/lib/active_record/core.rb
	activerecord/test/cases/dirty_test.rb
Merge pull request #7723 from steveklabnik/backport_3554

Backport #3544 to 3-2-stable
Fix invalid ruby 1.8 syntax
ConnectionPool accepts spec key 'checkout_timeout'

Backport of #6441 cb6f83935 . Old 'wait_timeout' is still supported,
but conflicts with mysql2 using that spec key for different thing.
'checkout_timeout' can now be used taking precedence for ConnectionPool
over 'wait_timeout'.
Merge pull request #7684 from jrochkind/connection_pool_timeout_key_backport

ConnectionPool accepts spec key 'checkout_timeout' (Backport)
Only apply log tags if the logger supports it
Log newlines separately to ensure the 'Started GET ...' line has a tag on the same line
Add logger.push_tags and .pop_tags to complement logger.tagged

Avoid memory leak from unflushed logs on other threads leaving tags behind.

Conflicts:
	activesupport/CHANGELOG.md
	activesupport/lib/active_support/tagged_logging.rb
	activesupport/test/tagged_logging_test.rb
Tune up Rails::Rack::Logger. Only put space between requests in development logs.

Conflicts:
	railties/test/application/rack/logger_test.rb
Shush syntax warnings
Shush uninitialized @_layout warning
Hashrocket for 1.8 support
backport 68677ffb8298105eb9d3efa26d928dd88cc5e006
Merge pull request #7785 from okcwest/3-2-stable

backport 68677ffb8298105eb9d3efa26d928dd88cc5e006
Refactored pretty.py for Pow

Added a few comments

modified pprint for pow

Fixed some errors, more refactoring

Discarded all changes, starting from scratch. Just doing some simple refactoring, not making any major changes.

Added code to check if _print_base_exp returns None

Changed code, Now it prints a**-b for pprint(Pow(a, b, evaluate = False)) when b<0

Fixed indentation.

Deleted an unnecessary elif block.

Fixed indentation, pep8 modifications, sympy-like names for variables.

Fixed whitespaces

Merged smichr's commits. All tests pass.
Add index clauses to MySQL to facilitate searches
Merge branch 'master' of ssh://github.com/RowdyHowell/picnit
Fuck this shit, we're just going to use LIKE
Added more image data
Cont func. profile...
Merge pull request #118 from bdupree/master

Added more to profile.js
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Add Search API with two functions
Merge branch 'master' of ssh://github.com/RowdyHowell/picnit
Move last search function to Search API
some more profile changes
Merge pull request #119 from bdupree/master

Moar profile changes
Adding follow functionality in js. More tag stuff too.
Merge pull request #120 from asocha/master

fixed logout button DGFDFGHDHDTHKPRTIE%)TI)$)EJ%)J%GJR%T HRET )HRT
Merge branch 'master' of https://github.com/RowdyHowell/picnit
- Ifc: refactor opening/window generation code.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1337 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
Update: Debian-related cmake changes ( I changed the revision to 1256 instead of 1251 ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1256 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
coffeescript change / oversight / fix
Merge branch 'active'
httpfend access log logged under debug level

+ added favicon to avoid 404 errors
Merge remote-tracking branch 'origin/master' into httpfend
httpfend read loggin level from config
Merge remote-tracking branch 'origin/httpfend'
Updated PDF documentation for 3.0-RC1
[maven-release-plugin] prepare release dspace-3.0-rc1
[maven-release-plugin] prepare for next development iteration
Merge erroneously multiple Oracle upgrade scripts
remove explicit port-mapping shit from m3u generation
Added images.
Updated homepage.
cache: fix off-by-one-of-the-wrong-kind in BITMAP_CACHE_WAITING_LIST_INDEX handling
correct colors for 16-bit displays

(addressed merge conflicts)
modify jobs
Don't auto-update wakame-vdc
should we build glibc with emul32 or old-style?
added door.png to tiles
add publish.html
Merge branch 'master' into gh-pages
Add Submodule
Staging
Fix Clear API Bug
Imported Upstream version 2012.11.01
Added candle item and changed inventory implementation.
Merge branch 'master' of github.com:bark/Robinson
Merge branch 'development'
Properly enumerate volume availability zones - i.e. after reservation; make sure we don't duplicate security groups on update
Refactor update_from_api: fixes issues 1,4,5 (delete instances instead of marking as ghost). Enumeration now works with multiple instances per reservation, multiple secgroups, terminated instances, etc.
Fix typo in instance types view
Fix typo; temporary hack for Eucalyptus 3
Add api_user field to DNS providers model
Forgot to backport this one.


git-svn-id: https://root.cern.ch/svn/root/branches/v5-34-00-patches@47132 27541ba8-7e3a-0410-8455-c3a389f83636
Forgot to backport this one.


git-svn-id: https://root.cern.ch/svn/root/branches/v5-34-00-patches@47133 27541ba8-7e3a-0410-8455-c3a389f83636
Improved way of monitoring changes. Instead of issuing a ZooKeeper call for every change, just post an event to a queue so that the ZK can be queries. This way, in a distruptive moment, only 1 ZK call is made instead of many
I can't believe this has been like this for so long. The executor passed to the listener was never used. Doh!!! Major bug.
Issue 177: PathChildrenCache wasn't shutting down the executor when closed.
Merge branch 'cache'
Issue 177: Reworked event queue for PathChildrenCache to avoid potential herding of messages in unstable conditions. The herding could result in runaway memory allocation as reported in the issue.

Conflicts:
	curator-recipes/src/main/java/com/netflix/curator/framework/recipes/cache/PathChildrenCache.java
updated
Issue 200: Post-creation services registered in ServiceDiscovery via registerService() were
not being treated the same as the service passed in the constructor. Consequently they wouldn't get
re-registered if there were connection problems.
Use a map to hold services. It better ensures single entry and allows for updating
wrap data in toString
Creating withProtection() is now supported in the background
updated
Merge pull request #203 from Randgalt/master

Updates
Merge remote-tracking branch 'upstream/master'
usunięcie starych rzeczy
Add .git to ignorable paths during introspection
fixed how to do