labofsahil/github-event-dataset-2012 huggingface dataset:
Fix rhel5 / python2.4 mmap error

Running whisper-dump on RedHat 5 produces the following error:

Traceback (most recent call last):
  File "/usr/bin/whisper-dump.py", line 84, in ?
    map = mmap_file(path)
  File "/usr/bin/whisper-dump.py", line 19, in mmap_file
    map = mmap.mmap(fd, 0, prot=mmap.PROT_READ)
EnvironmentError: [Errno 22] Invalid argument

Which can be fixed by supplying an explicit size to the mmap call.
find verb lemma in server and send it to client
Merge pull request #79 from fgrehm/fix-mass-assignment-with-nil

Do not throw exception when nil is passed to #attributes=
Added AstAccountEncryption to schema, added AstSiteDefaults objectclass
Added extra schema for Asterisk site defaults
First iteration of the ipa astsite object
 - Added official schema file
 - Begin additional non-official schema
 - Added sample config files
Change to UpdateUser
Merge branch 'master' of ssh://git@github.com:22/sparkplug/DTS.git
UpdateUser Change
fix #3367 avoid firing weapon if wantedDir and lastRequestedDir differ too much
Less jerky camera transitions

Signed-off-by: jK <-jk->
cleanup & fix c336187
make camera a bit smoother by adding some transitions
Restore the optional config file write restrictions
Fix Mantis #3112 (Sync warning when resizing the main window before game start)
add keyword stuff to utils
stopped output_filenames from outputting folder names

The output_filenames method of the Checker class was including folder
paths in its output. This was causing the internal_links and external_links
checkers to choke.
Don't drop out of connect if the first request fails.

This fixes a break caused by the recent try-harder-on-IP-addresses
change, where if the first connect failed we returned rather than
trying until we reached a connection or an error.
Merge pull request #54 from square/jwilson/reconnect

Don't drop out of connect if the first request fails.
1. CLI changes - (colo related)
2. Client.properties test cases
3. thread dump api
Merge branch 'master' of https://github.com/sriksun/Ivory
delete files on entity delete, PIM reRun runs just default
obob files
Start and stop ZAP process from the plugin
Combined ZAP alerts of the same type
Merge remote-tracking branch 'upstream/master'
[enh] progressbar added
Got working with Gibberish for proper encryption.
Removed old encryption pieces.
Started to fix swipe issues
스레드1
added section spec, added FactoryGirl to remove NDianness in testing
added uniqueness vlaidations to sessions, subjects, course names
updated the version
updated the gemspec
メモにバッテリ関係追加
added resources javascript & stylesheets & images
working our deface dependency
goci-datapublisher: adding commented out study filter
Changed example files. Added external stylesheet example.
copy most of the stuff from lastingstatement
and interface in server.js
Write gemspec's summary and description.
added function formatSelectionTemplate to customize the whole tag
Remove unused package import.
Stub class for handing migrations.
prevent main activity from switching pages while rearranging queue
updated android support library
resizing is so cool now
Add `rollback_deploy_tag()`.
Add `:event` arg to `%C` format.

And remove the optional true argument to `%e`, `%l`, and `%L`. This is
cleaner, a better place, and allows the color to be used in the display of
some text other than the event type. For example, we might later decide that
the change ID should be in the selected color, rather than always be yellow.
removed TinySystem stuff
Added data_acquisition: Plan to get some useful stats about validaitons

piecharts.rb is a program that wraps up the error logs produced by
rsbc_helper.rb into 'objects' so that we can manipulate them better.
Then it does some counting and sorting and reports some stats to the console.
Look at INSTALL for how the proccess works at this point.
Right now I have three applications installed on my computer and by following
the INSTALL I was able to get stats on those apps. Hopefully the proccess will
scale when we get into the 100s of apps.
divvy.rake needs to be placed in an applications lib/tasks dir where it will
be automatically picked up by rake. Then to generate the logs by running
mimic_server_side_validations on all models in the app, simply run
%> rake rsbc_translate
Update build instructions for Windows
test_read_performance: Output measurements to .csv file
[BUG] Nuke debugging issue fixed
Perform escaping outside of toField

Closes #15
Commit before switching to png
Merge branch 'master' of github.com:timd/zoomtest
if frame is never made active, we can remove it directly
Fixed homescreen lock getting stuck
fix window resizing
Reset scrolling when new candidate list is pushed
Merge pull request #841 from timdream/keyboard-fix

Reset scrolling when new candidate list is pushed
Added instant functionality to lock rebound
Merge pull request #837 from fabi1cazenave/resize

fix window resizing
Merge pull request #836 from lalunamel/homescreenStuck

Fixed homescreen lock getting stuck
Fix following issue #831
Merge pull request #843 from timdream/fix-831

Fix following issue #831
Added week4 material, which builds upon week3
Modified movies.sql
added tic tac toe example
added tic tac toe example
Added startup icon and appicon to tic tac toe
Added startup icon and appicon to tic tac toe
Added gitignore
Added week5
merged week 5
in class changes
Fix for http://jira.tizzit.org/jira/browse/TIZZIT-430
README をコピペして、適当に書いてみた
Symfony SE Submodule
Just a quick fix so you get the top of the pops here.
Merge pull request #6 from darobin/patch-1

Use latest ReSpec
Add View Orientation and Full-screen mode to markup.
Big rewrite following level 0 shelving.
Fix typo in ref.
Edit spec status.
[maven-release-plugin] prepare release TomP2P-4.1.2-preview
fixed active replication
fix
Merge pull request #3 from tomredtag/tom

fix
parser adde
regular commit
small changes
small comment
Added missing OCL api file load
Accept 'depends=DEP' - (before accepted only depends=('DEP'))
arg main
git grep時に行番号を常に表示するように修正
repo rpm back add
'init\
KT-2962 auto completion support for extension functions
 #KT-2962 Fixed
Add jet.deprecated to library
Replace CodegenUtils.isDeprecated to KotlinBuiltIns.isDeprecated
Minor refactoring at DeprecatedAnnotationVisitor
Add direction to JavaToKotlinClassMap and KotlinToJavaTypesMap
Map java.land.Deprecated to jet.deprecated
Change testData for deprecated annotation
 #KT-2947 Fixed
Assertion message improved
Properly determine what classes to show in Kotlin completion:

Classes like Int and jet.Iterable should are not visible from Java
since they are erased at runtime. We call such classes non-physical,
they have to be added to completion manually.`
Properly detect Kotlin built-ins:

Built-in classes like jet.Int and jet.Iterable are loaded from source
files by KotlinBuiltIns class. It makes no sense to create JetLightClass
instances for such classes, moreover, it causes runtime failures.
Now we check the location a file was loaded from before creating a light
class, and skip if it is a built-in.

We also assert this in teh actual generation of light class bodies, and
print out OS information if something fails, because our detection strategy
may depend on OS-specific behavior.
Unused fields removed
Mutable field made volatile:
this is a temporary measure to prevent some artifacts of concurrent access
Pointless catch removed
Nullability warnings cleaned up with assertions
Private helpers made static
Extract method
Caching most popular built-in types and classes
Common method used
Fix memory leak when reloading config. Scope is a bitch.
Retry failed test launches

Runs project tests again when TestRunListener receives sessionLaunched but no
subsequent sessionStarted callback.
Factor out user client vars
Assign user colors, show icons for concurrent editors

Hovering reveals author colors in pad
Track & display outsourced task status
Fix HTML template bug
Record deletion author as a changeset attribute
User acquires same color when logging in again
Restore code to generate ACE lines, adding style namespace support

This effectively reverts commit f9994cb.
Avoid a Markdown formatting bug
Secondary content frame that pushes primary content off to the right
Add IDs to distinguish from other <iframe>s
Show an author's changes during a timeframe

Highlight additions and deletions, and fold away unmodified sections. Cache
computed changes for reuse.
Summarize changes and link to contribution view
Rename class and classpath container to allow for additional functionality

Requires modifying the .classpath file of any existing projects to use the new
name.
Compute method-level test coverage with Jacto and AspectJ load-time weaving
Test coverage view, linked from test results
Contrib view accessible to users with write permission
Fixes for IE
Prevent infinite loop retrying failed test launches
Fix error when coverage is unavailable
Fix menu issue and log
fixed doxygen warnings
fixed doxygen warnings
merge with offical
small documentation fixes
added test for index specifiers (WeightArg, DataArg)
Merge Frederik's documentation updates
fixed accumulator tag dependency bug
cmake: let Python itself find its include and library
Import working version
Interfacing a 10k pot to MSP430
Made search work for one HABTM, fixed most tests
fixing small bug with file uploads. now file parts of the post request won't show in the POST params, just in FILES
Added active social buttons to sections pages
test: lpc: add lpc for 2 sats
Processors can now be executed via a chain or a standalone executor.
Изменениеa
Merge branch 'master' of https://github.com/vkopitsa/test
Add version@timestamp to welcome message
Expand tilde once we check for options
Separate read/write operation on pem file
1027 import project: error when no beam files exist
fixed GH#51: otp edoc shows strange chars
start #1010
Fix: Value config pins always returned false on PinIsChanged and fixed an issue where a Changed event on config pins wasn't get fired after a manual flush.
Removed unintended contentscript include of a nonexistent soldiers.js file. ADD: APIs for update_items, update_magic, update_land. MOD: COPTER request rewritten to allow a JSON POST without jsonp. I am now allowing crossdomain posts on my end restricted to http://web.castleagegame.com/castle
Adds the deep_merge gem
Deep merge custom tags when only a username_token
Deep merge for custom tags when only a timestamp
Deep merge custom tags when timestamp and username_token
capture and play frame by frame support

TODO: get the original size.
BUG: the capture file name using the pts, which may be the same for the
adjoining frames.
clock value is pts+delay

BUG: the video is a litter faster than audio!
Qt5 logging support
removed ref to Brace class that was causing server error 500
Fixed a bizarre merge issue.
Slightly better static lib link fix.
Merge branch 'trunk' into padic
Sped up computation of forms slightly.
Fixed lengths of S, T in fmpz_mod_poly_xgcd.
inline student names
Merge branch 'test' of https://github.com/wdi2/students into test
js slidedown on students
Merge branch 'test' of https://github.com/wdi2/students into test
scheduler in widget menu, thanks Niphlod
improved toorbar, thanks Anthony
new method getSize()
now the recently used project will open up - enhancing project saved infos
Updated .gitignore.

Excluding a log file from source control.
add missing config.py
Merge branch 'master' into devel

Conflicts:
	catsup/config.py
JS_MVC
Fixed  Mattern for ThreadedWarped by resetting white message count and adding a GVTPending status check
Merged the last commit for Mattern's Fix with Sanchits Change
Data nu gesaved als 1 xml file, ipv twee verschillende csv bestanden
error messages in createNeededFiles, check for keyfile only once, instead of
once for touch command, and then using curl
Revert "debug.php"

This reverts commit cae1d0e0633af700afe5518ecf9c8111977c3031.

arvind: reverting hayson's accidental checkin of my committed file
Rename model classes
Updating versions and sorting out the set of features required for Hosting server

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@133948 a5903396-d722-0410-b921-86c7d4935375
Fixing an issue due to "undefined" in JSON serialization


git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131256 a5903396-d722-0410-b921-86c7d4935375
Fault sequence updated

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130070 a5903396-d722-0410-b921-86c7d4935375
Fixed an issue in subscription page

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130073 a5903396-d722-0410-b921-86c7d4935375
Corrected errors in application page and sign0up page left pane

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130076 a5903396-d722-0410-b921-86c7d4935375
Adding a sleep between two schema updates

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@126381 a5903396-d722-0410-b921-86c7d4935375
change to WSDL

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@126382 a5903396-d722-0410-b921-86c7d4935375
remving duplicate copy statement

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@133206 a5903396-d722-0410-b921-86c7d4935375
fixed ESBJAVA-1238

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132729 a5903396-d722-0410-b921-86c7d4935375
Updating ScriptObject import


git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130408 a5903396-d722-0410-b921-86c7d4935375
Connection with REST for loading orders, adding orders, adding additions, changing status 

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130409 a5903396-d722-0410-b921-86c7d4935375
first commit from dropbox

first commit
getting rid of blue wall
Updated
Updated Layout
Improved UnioFind.groups performance
june 1
june 1
iwait: Adding option to help-text.
z-index fixes site-wide.
Blank link to fix code syntax in README?
Added arch_cpu.cpp to the x86_64 build.

* Some things are currently ifndef'd out completely for x86_64 because
  they aren't implemented, there's a few other ifdef's to handle x86_64
  differences but most of the code works unchanged.
* Renamed some i386_* functions to x86_*.
* Added a temporary method for setting the current thread on x86_64
  (a global variable, not SMP safe). This will be changed to be done
  via the GS segment but I've not implemented that yet.
add git add complete
Travis: Only show status of master branch
Software installation and data logging setup...
hibernate 归回测试
updated project file with exclusions
modify: tests for validation
modify: tests of Visibility::Published
add: tests for Visibility::Publish
Move to source directory and replace makefile
Merge branch 'fixed'
Fix leaks and return NSArray * when we claim to, not secretly NSMutableArray
- Dosya açma özelliği eklendi.
borrar temporales
update functional-test module cargo jboss to use JDK6

To avoid exception being thrown when using JDK5 jboss
Statement.isClosed() and ResultSet.isClosed() method are since java 1.6. When using JDK5 jboss instance it will throw exception:
    java.lang.AbstractMethodError: org.jboss.resource.adapter.jdbc.jdk5.WrappedPreparedStatementJDK5.isClosed().

Also update that code to not call this method. Calling close() on an already closed ResultSet will be no-op. So won't matter.
minor
rhbz803909 - right click should select row
minor
Implement simple chat in userworkspacePanel
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
findbugs - minor
Bug 816843 - [WebTran] Next and Previous Fuzzy/Untranslated keyboard short cut does not work
Fix chat layout in Firefox, implement dummy mode for new action
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
getting delombok to output code
work in progress - exclude lombok code under gwt client side and use delombok ones
remove lombok annotation from gwt code but keep plugin in pom
fix bug: https://bugzilla.redhat.com/show_bug.cgi?id=820065
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Fix bug with illegal collection load for version group
Fix bug consistance behaviour of editor after filtering: https://bugzilla.redhat.com/show_bug.cgi?id=816830
Fix problems found in findBugs
allow project-wide search in source in addition to target
Don't invole the volume setup script in user data.
Just write some meta data so puppet can.
Typo
Updated setup_volumes to use /etc/zim/volumes rather than ZooKeeper
to get volume information.
j/k, actually fixing now.
add hadoop ebuild
Print zmq version in HelloWorld test.
Update compatibility for libzmq v2.2.0.
Add build script for using a custom libzmq.
Prevent test failures on 2.x build.
#79 #92 nacl time service removed. small fixes
B36_1968615Test
Merge pull request #143 from ldnigro/B36_1968615Test

B36_1968615Test
explainProc works properly, is this done?
* packaging/common/post_inst_functions.sh: revoke rw permissions for
  group and other
* packaging/common/post_rm_functions.sh: fix function name to match
  usage.
* packaging/common/test_sh_libs.sh: update test.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/branches/3_3@5069 a8d146d6-cc15-0410-8900-af154a0219e0
attributes
eol
attributes
Merge branch 'master' of git://github.com/laruence/php-yaf
indent
add manage.class.php
scale thrusters
Use showCommandForUser when it's available (GHC >= 7.2)
Add support for keeping temporary files

Currently only the haddock command has a flag to enable it
autoconf 2.69

Upgrade autoconf to version 2.69 and adjust the patch only to deal
with the different line number.

Closes #11866.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
gdk-pixbuf 2.26.1

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Symlink brew zsh completion to default location.

Fixes #11867.
pygtkglext 1.1.0

Closes #11801.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
OpenSSL: Fix regression in 1.0.1a for Mac OS 64-bit

Closes #11869.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
Revert zsh completion installation

This reverts commit c5a9ff8eaac30e4ac468ac199167d791661a0c69.

Fixes #11871.
+ missed changes for BSW AI
fix style and functionality on menu
add style into welcome page
Scheduler now calculates the scores correctly.
activate treeselector widget in rdfauthor config
remove one class, remove left padding of input
remove class attribute, update library path of jstree
add jstree to treeselector-content
delete peaInvasion/../JsoHighscore.java
Syncing project with pushes from last night.
Changes to configuration
Clarify instructions for generating Thrift wrappers
[Fix] Tag icons.\n[Add] Precompiled header is now formal.\n[Fix] Windows compilation error.
long overdue commit of *most* of mongo backend implementation.
Main work on httpd done. For some reason, it crashes google chrome.

Added submodule to Phalanxia's Hanasu Web App repo.
When back and started fixing more bugs.
Aller - retour, serveurCompo -> connexionManager -> serveurCompo
Add championship team counts per category
Modify DB table structure, continue
Use astyle as source formatter.
config logger, add send email functionality
doc: fixed --cap error and a few additional bits of cleanup.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
Merge branch 'master' of git://github.com/ceph/ceph
Use default qemu-img cluster size in libvirt connection driver

The recommended cluster size [1] for qcow2 is 64k, which is the default
when invoking 'qemu-img create ...'.  Remove the cluster_size option
from qemu-img invocation.

[1] http://www.mail-archive.com/openstack@lists.launchpad.net/msg11371.html

V2: Fix test.

Change-Id: Iafc290720a820cb5f57ded10a2f584fdc5cd5b49
Setup logging, particularly for keystone middleware

Fixes bug 979282 and bug 988951

Change-Id: I895d00ac9648e8b3cb3ad1bf141c9bfe02ef3680
Merge "Setup logging, particularly for keystone middleware"
Merge "Use default qemu-img cluster size in libvirt connection driver"
Add access file - easier to access database
- should now be able to install with pip install -r requirements
Merge branch 'master' of https://github.com/BlueBrain/dash

Conflicts:
	tests/CMakeLists.txt
Install more detail headers for codash
Some more work on the resolver (namely condition validation). also fixed parsing of invalid prefix operations
move repositories to /home for user, step 1
Some cfg updates
move repositories to /home for user, step 2
Uodated all documents with this from BlueHouse
release notes documents
Revert "Revert "Check interface methods for -""

This reverts commit b4e45f323b7604f917918d602fbab2ea1a112dff.
It doesn't break protocols since names get munged.
Fixes pastie

Signed-off-by: Akash Manohar J <akash@akash.im>
Minor fixes and also removes some logging

Signed-off-by: Akash Manohar J <akash@akash.im>
moved tabs in to actual header markup as they should be. working on scrolling form browser window and not inner divs
Fixes channel deletion

Signed-off-by: Akash Manohar J <akash@akash.im>
Merge branch 'master' of github.com:Bushido/Kandan into tweaks
Fixes channel creation and deletion

Signed-off-by: Akash Manohar J <akash@akash.im>
chatbox styles and tabs and scrolling
duplicate template sync
scrolling back in action
proper event attachment for close and create channels
partial delete
deletes appear to be restored
adde channels seems ok, need fix for the button
create tabs work now
proper border on right
scroll fix wiht a mask
live events for delete and create channel
logout positioning
Fixes, Fixes and Fixes. And then merges 'master' into 'tweaks'

* Changes jQuery events to backbone events
* Fixes channel deletion
* Fixes channels helper and deletes unnecessary methods
* Renames chatarea template to channel_tabs
* Fixes channel notification processing
* Uses a backbone view instead of directly appending channel tabs html

Conflicts:
	app/assets/javascripts/backbone/helpers/channels.js.coffee
	app/assets/javascripts/backbone/views/chatarea.js.coffee

Signed-off-by: Akash Manohar J <akash@akash.im>
Show unknown contacts. Partialy fix group participants.
add interface for print objects
Add dynamic operator typing in linearsearch
report test skeleton
Merge pull request #105 from CS340Group/nick

Nick
e_render 0 when the window is not focued to spare fps
Scene : constant movement
Merge branch 'master' of github.com:ClubEngine/gj4
Merge : Mouvement vitesse constante
Merge branch 'master' of github.com:ClubEngine/gj4
initial commit commen
Merge branch 'master' of github.com:ColdFreak/Test
fixing show search when param q present, fixing tags click in chrome on linux, and removing access tracking
Fixed a bug where all the BQC where removed.
Putted a real bqc address in exemple.
Save the dossier numbers also with an amout of 0.
Load the google analytics gem for production environment.
Load google analytics as middleware.
Remove spaces.
Convert erb to haml.
Create a new container when first document year is inserted.
restore 2 mount mysteriously disappeared when moving from svn
added type to PropertyrModel
replace \n with space in text TV
Added JQuery Library
Added JQuery
use position instead of x/y
node uid in form, prompt params when creating node

(started for sensor. to come: native node, actor)
be consistent about handling positions

also, fix for parsing list-arguments in the rpc call...
Native modules. kind of hacky.

Native modules are currently not really compatible with the setup: they bring their own slots, gates, and nodefunctions, so we can't use the Nodetypes as they work now. I've omitted the slots and gates, and just hacked the nodefunction in for the moment, giving each Native Module instance its own nodetype (otherwise the native modules would all have identical nodefunctions)...
RI: More Codefix
Fixed compilation error.
Merge pull request #16 from ImperatorPrime/master

AURORA: Fixed Compilation error.
added files for the base classes
file
Merge branch 'master' of github.com:Drealdal/pomme
Fix a couple of warnings and the var type in list

*Details*

* GCC did not warn about assigning void pointers to a different type, but VS2010 did.
* doubly_linked_sortval.SortType should have been sort_demo_primitive_t.
* main() wasn't using the arguments, so just take them out.
Update default server configuration.
DecisionalEngine.py started
glcd driver presque final
plugin.yml fix
Many Changes
many changes
Make date formatting helper more user friendly
Removed old addFormatter method
Merge branch 'master' into feature/i18n
Add locale setter and getter for DateFormat helper
[i18n] Currency, NumberFormat View Helpers
Merge branch 'i18n-view-helpers' of https://github.com/cgmartin/zf2 into feature/view-helpers-i18n
View helper / controller plugin managers should not peer with main SM

Added getter/setter for the main ServiceManager in the
AbstractPluginManager so that factories can still have access to the
main SM if needed.
[zen-66] Fixes to i18n view helper tests

- UTF-8 whitespace was causing testing issues based on platform; added
  specialized assertion for those classes needing to test MB strings
  with such whitespace.
- IntlDateFormatter::FULL format evidently varies based on OS; removed
  those test cases that used it for comparisons.
[zen-66] Add I18n helper config as a default

- Adds Zend\I18n\View\HelperConfiguration as a default for the
  ViewHelperManagerFactory
Merge branch 'hotfix/sm-plugin-managers-not-peering' of https://github.com/EvanDotPro/zf2 into hotfix/plugins-peering-removal
ModuleManager fixes for ServiceManager Configuration/Config changes
WIP: testing the connectome pipelien with ubuntu 12.04
Merge branch 'master' of github.com:FNNDSC/scripts
_common --> import error on crun
data_summarize.sh and lobe_annot.sh: output format fixing.

mris_autodijk.py -- development
Kleine fix aan game; niet gedefinieerde functie verhinderde compilen.
Empty commit
Merge pull request #8 from timvdalen/guilink

Branch fout
Merge pull request #9 from FerryT/master

latest changes in protocol and game engine
Materials fixed.
Merge branch 'master' of github.com:timvdalen/OGO-2.3

Conflicts:
	src/game/core.h
	src/game/materials.cpp
	src/game/materials.h

Merge na aanpassen Materials.
Objects uit klasse diagram toegevoegd.
merge conflicten gefixt
fixed msvc errors
addum
msvc and apple errors
fixes
and again
Macos makefiles
Makefile2 Crossplatform eruit
Merge branch 'master' of github.com:timvdalen/OGO-2.3
Verbeteringen report.
Merge branch 'master' of github.com:timvdalen/OGO-2.3
Typo verbeterd.
Typo verbeterd.
Adding Query support to MemoryTailableIterator
Regression test for content transfer to oldDocuments
Merge pull request #45 from jwestberg/master

Adding Query support to MemoryTailableIterator
Added basic save manager stuff.
MyChunk now allows players to break/place in WorldGuard regions that
they have permissions in.
I do believe there is more WG checks that has to be made, maybe possible
to make MyChunk operate underneath WG in some way?
Smazán jeden stupeň odsazení v příkladu číslo pět
get redis server address and password from env
allow the worker to redirect SIGINT to parent, hence allow the interrupt the program by Ctrl+C
lower the timeout
Automatic Windows Build

git-svn-id: http://gwen.googlecode.com/svn/trunk/trunk@301 82b74e7c-beea-4a93-d681-cf472943600a
Factories for slider and combobox

git-svn-id: http://gwen.googlecode.com/svn/trunk/trunk@302 82b74e7c-beea-4a93-d681-cf472943600a
earlier versions of premake don't have debugdir

git-svn-id: http://gwen.googlecode.com/svn/trunk/trunk@303 82b74e7c-beea-4a93-d681-cf472943600a
Don't commit the binaries

git-svn-id: http://gwen.googlecode.com/svn/trunk/trunk@304 82b74e7c-beea-4a93-d681-cf472943600a
Don't automatically link

git-svn-id: http://gwen.googlecode.com/svn/trunk/trunk@305 82b74e7c-beea-4a93-d681-cf472943600a
Don't commit the binaries

git-svn-id: http://gwen.googlecode.com/svn/trunk/trunk@306 82b74e7c-beea-4a93-d681-cf472943600a
Added readme
added gitignore files
Merge branch 'master' of github.com:FusionOpz/Gwen
+ Add missing interfaces (Extension, Lexer, Parser)

Signed-off-by: Steven Hoffman <git@fustrate.com>
+ Use previously added interfaces

Signed-off-by: Steven Hoffman <git@fustrate.com>
! Environment -> Engine, coding style changes

Signed-off-by: Steven Hoffman <git@fustrate.com>
+ Add most of the rest of the missing functions to Engine from Twig's Environment
+ Make some methods chain able

Signed-off-by: Steven Hoffman <git@fustrate.com>
fix misspelling word
Fix empty channel list after reload bug
Better file argument support for easypaint (issue #81)
aggiunta iva
aggiornato gitignore
cancellato file DS_store
Adding submodules and integration for image & tex2png
Renaming copyDirectory to copy
uploading touch interface
draw part of gesture
replace 'this' -> 'pThis' to avoid error with c++ compiler, increment version
Cleanup
Add translation table dumper
Merge branch 'android-dev' of github.com:gendalfas/hyparm
Updated PostGIS settings so they work with 9.1
Adding information about Hipofiz
falan fasdailan
Added colors. Refs #1
Teste do corithiano.
Merge branch 'master' of github.com:IGED-UFPB/IGED
fix bug 21
making some fonts bigger
Case 769 - Fix related views for project ct
Merge branch 'case-769' into dev-line
Merge branch 'dev-line' of github.com:IliaDragan/vg3 into dev-line
Fixed sidebar menu after manually migration, added new page fot menu, fixed views for related exercise and materials, added latest sql dump
system wiadomosci
modified Makefile, added to names.conf
added &t=chakra to aur2ccr 'ad' link
oops- added missing 'r'
changed bad printf to ed in addmaintainer()
fixed makedepends bug
removed python2=python rule from names.conf
added perlxml rule
replaced print statements with proper logging
Greganyzoo: Die Wachen Prüfen jetzt korrekt, ob der Spieler keine Eintrittskarte hat.
Dies sollte Issue 167 beheben
added initial classes for hardware abstraction layer, copying the
implementation from an earlier version of VexOS written last April. Parts
are untested and central device management is not implemented.
added motor and motor group support (all untested)
some additional methods to get ports added to other hardware classes
Power set in principle done... however very slow
Kervalas Stat class da testi
fix #685 update example code for storing data.
index: added express3 example
fixed syntax error
Merge branch 'gh-pages' of https://github.com/LearnBoost/socket.io into gh-pages-orig
Merge branch 'gh-pages-orig' into gh-pages
translate 5 to 6
org export css update
halvdant försök att börja kommentera
Commented Code

Signed-off-by: kelly <kelly.ru4n@gmail.com>
Comments

Signed-off-by: kelly <kelly.ru4n@gmail.com>
Comments, minor refactor

Signed-off-by: kelly <kelly.ru4n@gmail.com>
Add missing consts in kmVec2RotateBy function
Merge pull request #4 from Cloudef/vec2-const-fix

Add missing consts in kmVec2RotateBy function
Remove duplicated function prototypes (thanks Chris Camacho)
slightly more javadocs, that's enough for tonight.
Modified default controls to directional (rather than tank-controls).
Fixed a crash caused by property signal generators not being destroyed when they have been.
Panic-commit as I suspect my HDD may be dieing.
mya-0.95
Mark floats in printable value

Summary:
The output is confusing for `assertEqual(0, 0.0)`:

> Expected: 0
> Actual: 0

Test Plan: New test.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3475
Fix function name in exception message
Fix indenting
Use a 80x50 console
Do not limit GCC in it's register choice needlessly
Return count
Remove superscript button
Exo sur les series alternatives
Removed defaultvalue for permissions
Removed permissionattribute on mazegenerators
Changed permissions
Added permissionchecks
beta 2.1 changing mode inmplemented.
Merge branch 'master' of github.com:LeGBT/Sections
add a e b
dpl.tex macros.tex
Merge branch 'master' of https://github.com/Lebedka/Papers
Iniital version of NumJum 2.0

ASP.NET Web Application
Install colordiff by default.
Add mc to the list of installed software.
Add a tutorial on using crosstool-ng and buildroot to build Linux for the BeagleBoard.
changes made to front page graph for mobeta fixes bug 771116
Merge pull request #788 from ossreleasefeed/mobeta-front-page-graph-771116

changes made to front page graph for mobeta fixes bug 771116
Changed default term to screen-256colors
Renamed all omega stuff to ``leader''
Added output for frame.bas
Probando cambio pull
ajout des en-têtes des fichiers
[10602] Other/Checksum: d41d8cd98f00b204e9800998ecf8427e

Signed-off-by: Pascal Vahlberg <pascalvahlberg@yahoo.de>
Added functionality to update ECU ID (logger identifier)
Update news and logo
fix daemontools for new setup
Syncing with theme
Add delay for slow system. Done with #333.
Fix comment length (yeah I'm that OCD :p)
Switched back to 2.0.12
[Design] Update input design for iOs
CSS changes for the checkbox control.
ASGARD-929 - Task subject emails should not contain hardcoded 'nac' String

Also, a bit of rewording for the subject line to move short, pertinent info up front.
Merge pull request #119 from joesondow/ASGARD-929-Task-subject-emails-without-nac

ASGARD-929 - Task subject emails should not have hardcoded 'nac' String
Upgrade to AWS SDK 1.3.23 for SSL security fix

http://aws.amazon.com/security/security-bulletins/reported-ssl-certificate-validation-errors-in-api-tools-and-sdks/
Merge pull request #162 from joesondow/ASGARD-1017-aws-java-sdk-1.3.23-security-fix

ASGARD-1017 - Upgrade to AWS SDK 1.3.23 for SSL security fix
Optimized the BasicLayoutStrategy ability the make squared layouts a bit more
Added a context menu and the ability to hide (selected) figures
Merge branch 'development' of github.com:Newanz/HUSACCT into development
Ajout d'un fichier hltv.sh, modif de l'hlds.sh, et modification de la fonction d'upload des scripts shell.
Modification des images pour la partie serveur de jeux

Signed-off-by: Jerome Smedts <godofking222@gmail.com>
ajout de la commande pour l'update de la bdd

Signed-off-by: Jerome Smedts <godofking222@gmail.com>
suppression du theme redmond

Signed-off-by: Jerome Smedts <godofking222@gmail.com>
Modification du design de la configuration des machines

Signed-off-by: Jerome Smedts <godofking222@gmail.com>
Modification du design de la partie serveur de jeux

Signed-off-by: Jerome Smedts <godofking222@gmail.com>
Integration du theme redmond pour jquery ui

Signed-off-by: Jerome Smedts <godofking222@gmail.com>
Modifications diverse du design

Signed-off-by: Jerome Smedts <godofking222@gmail.com>
applyConst dimenion in initEta fixed
newrat.vln init Eta function added
Merge remote branch 'origin/app/volna' into app/volna
Many important changes related to the script

- Build-in tune2fs
- Making mount point for ext partition if needed
- More logging
- Cleanup
Rewrote some things - Should be cleaner

Signed-off-by: Dalton Pelc <daltonjpelc@gmail.com>
Fix typo on videos page, and make it centered
Update library/eden/facebook/link.php

* parameter name for the 'url' is 'link'
* throw exception if response is error
Merge pull request #9 from OptimusMarlboro/patch-4

parameter name for the 'url' is 'link'
throw exception if response is error
by: OptimusMarlboro
change manifest to PAmoto
Added helper method updateSliders
Updated a little bit
Merge branch 'master' of https://github.com/Panum/sw701e12
Added some report structure
update node.js demo from {@for} to {@each}.
Implemented a single token stack to handle all code blocks
Deleted file extension from executable Bash files
Moodle 2.2.6 - 12 November 2012
Merge pull request #475 from audreyr/master

Highlighting another line that the user should edit in the tutorial
Merge pull request #474 from ppaez/wiki-documentation

Clarify two steps in the SQL wiki tutorial
Improved the Authorization chapter

- Added a summary of the steps
- Fixed a couple of typos
Sync section titles with the summary
Improved the Authorization chapter

- Highlighted the added lines in the listings
- Simplified 'Viewing the application in a browser' and
  added link to Starting the application
Merge pull request #479 from ppaez/wiki-documentation

Adding Authorization chapter of SQL wiki tutorial
Merge branch 'master' of github.com:Pylons/pyramid
mention comments
point docstring at the most up to date method
fixed: repeated request of a incomming list triggers exception
Job model and new get response added
Update jQuery to version 1.7.2.
Update JSLint to version 2012-03-15.
Bump version to 1.0.6.
Revert "test github.app"

This reverts commit 7025872ddf9e620a1d5092622de0cfbb4885071d.
Revert "Revert "test github.app""

This reverts commit 75a1480016477cca92f6b7c087af59465a7d5a38.
Revert "Revert "Revert "test github.app"""

This reverts commit 767a84adce09728dbc72a0cbb35de938207cc574.
actualiza el model
cleaning out prototype code
copied node code into repo
[Defect #12088955] iPhone issue unable to edit fields near bottom of layout
Add Round system

added just a basic round system
Cleaned up code to compile with latest SFML
solved the easy way
Build
Add an AssociationValidator to ensure that associated records are valid.
Allow controller test to run standalone
Merge pull request #527 from amco/master

Simple test fix for `$ is not defined`
Build
fires error event on current app, allowing for default to be prevented
added default isPrevented state
Ensure that lifecycle callbacks occure before validation during record save.
Rename to keep with the Rails conventions. <3 @jamesmacaulay.
Create a handy folder for the odds and ends which needn't be at root level src.
Refactor out a Batman.Proxy class for proxying gets and sets to a swappable target.
check for Batman.currentApp, as it might not be set, then return params if event is prevented
add missing 'in'
Allow EventEmitter::on and once to take many keys to attach a handler to.
Merge pull request #530 from tacomanator/master

Add missing word "in" to docs
Merge pull request #523 from Shopify/validate_associated

Add an association validator to validate associated records
Clean up some freestanding @ and variable names.
Ensure Proxy doesn't apply its targets properties to itself at the start
refactored error handling based on code review by @nciagra
Merge pull request #528 from Shopify/handling404

fires error event on current app, allowing for default to be prevented
Add the /services/reset endpoint

This endpoint allows a profile to reset all of the services and have
them repoll all of their information.
rip off url after, flickr does not use it
Adding logging in email
Logging settings for email
Skeleton of the Moving 2012 page and slide
lets move!
got the footer out with dominicks help
removed border, set transparency to .7 and made buttons bigger
finally got the logo in the right spot
Merge branch 'moving_2012' of ssh://60main.slashrootcafe.com/home/slashroot/git/WHAT into moving_2012
tims fix
resolved conflikt get rid of nav bar on moving page
right arrow for justin
Moving page.
Merge branch 'moving_2012'
Partial fixes for #99 and #100
Merge branch 'apps-refactor' into the_real_ui

Conflicts:
	static/css/landing.css
	static/images/current-logo.png
got max off the admin contacts list
Merge branch 'master' of ssh://slashrootcafe.com/home/slashroot/git/WHAT
a little css fixing on the ticket_profile page
added twilio counter parts to all tropo tests
Merge branch 'master' of ssh://slashrootcafe.com/home/slashroot/git/WHAT
typo on one of the comm tests
Modified the grammar to use nicer appender system.
Fix line endings

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Merge pull request #2128 from W1ndwaker/master

Fix line endings
Fix Rended -> Rendered

Signed-off-by: L5D <cholley.thibaut@gmail.com>
Merge pull request #2105 from L5D/renderQueue

Fix Rended -> Rendered
Use RenderMaterial specified in BlockMaterial !
Load texture later (need to load VanillaMaterial when GL11 is ready)
Clean up ChunkMesh

Signed-off-by: L5D <cholley.thibaut@gmail.com>
Merge pull request #2026 from L5D/master

Use RenderMaterial specified in BlockMaterial !
Call onSpawned when spawning an entity into the world.
Signed-off-by: Chris Sanders <zidane@outlook.com>
paymentsms.rb
sms
Update freespace2/fs2_open/options
Added meeting minutes from 7/23/2012.
Fix wrong var replacing
Update war/pom.xml

Fix repos, update dependencies, make natives 'just work'
fixed
Merge branch 'master' of github.com:TheRealJZ/Zees
added test-suite stanza to cabal file, and .travis.yml file to drive it
Add travis-ci status image
Merge branch 'Branch_d2043bcdbf3f1f161daba82185bbf1bcafb116d6'

Conflicts:
	nbt.cabal
	test/Tests.hs
clean up SpoutChunk constructor
re-send chunks when a large amount of light has been recalculated
Moved chunk save/load functions into their own class

Signed-off-by: Olloth <olloth@gmail.com>
Fixed warnings.

Signed-off-by: TomyLobo <tomylobo@nurfuerspam.de>
Fixed some whitespace.

Signed-off-by: TomyLobo <tomylobo@nurfuerspam.de>
Implemented the new get/setTransform methods from the Entity interface.

Signed-off-by: TomyLobo <tomylobo@nurfuerspam.de>
move handlers.
Compiler: Added gcc_unused_field macro
LX: Don't use altitude if it is not available

ProvideTrueAirspeed() uses whatever altitude is available instead of
assuming that the pressure altitude was read correctly.
LX: Reuse existing "value" variable for pressure altitude

There is also no reason to initialize it since the TAS calculation is not
using it anymore.
Condor: Removed empty functions
Condor: Only provide baro altitude if available

Don't assume the altitude is zero if it is not available...
TestDriver: Improved LX driver unit tests

Added checks for wind speed and direction and empty sentence behavior.
The Condor driver was failing the empty sentence test...
NMEA/ExternalSettings: Added volume attribute
LX: Parse volume field of the LXWP2 sentence
IGCParser: Added IGCParseLocation() function
IGCParser: Moved check for 'B' character out of IGCParseFixTime()

This is not related to parsing the time.
IGCParser: Renamed IGCParseDate() to IGCParseDateRecord()
IGCParser: Simplified IGCParseFixTime() function
IGCParser: Renamed IGCParseFixTime() to IGCParseTime()
IGCParser: Added IGCParseDeclarationHeader/Turnpoint()
Connected memory manager component to game class
Fixed library exception prefix
Questions of the 2012 june exam in Computational Linguistic
add a few more missing OK messages
Shows dates in activity streams in USA format
sprit :: utility functions
Added graphics and styles for horizontal workspaces as used in the "Workspace Grid GNOME Shell Extension"
Added graphics and styles for horizontal workspaces as used in the "Workspace Grid GNOME Shell Extension"
Merge branch 'master' of github.com:WBTMagnum/Holo
Eliminado creación de Tipos.
Added a simple Hello World!
Removed unecessary cipher on addList
Fix report result display mistake.
* gcc still doesn't like pair return values, so use an uint2 instead
add hlsearch behavior
bumped to 1.6.0-SNAPSHOT
issue 384: improved ISession management; managed to start VBoxExperimentLiveTest with 30 guests; added ubuntu 10.04.4 support; paramentrized guest memory
Merge pull request #844 from andreaturli/virtualbox

issue 384: improved ISession management; added ubuntu 10.04.4 support; 
Fix deleteAndVerifyContainerGone return value

Return true if the container does not exist -- this matches the
behavior of Atmos and Swift.  This allows deleteAndEnsurePathGone to
terminate correctly with S3.
Avoid Futures.getUnchecked in DeleteAllKeysInList

This masks InterruptedException.  We should rework the logic in
execute to unwind the stack on errors; currently we only return from
the leaf method.
Merge pull request #847 from andrewgaul/delete-all-keys-in-list-futures-get-unchecked

Avoid Futures.getUnchecked in DeleteAllKeysInList
Merge pull request #846 from andrewgaul/delete-and-verify-container-gone

Fix deleteAndVerifyContainerGone return value
Support for setting RunScriptOnNode.Factory

- Set default RunScriptOnNode.Factory impl using @ImplementedBy,
  rather than hardcoding the binding
Set EC2 windows-template image id for testing

- Identify the windows-template AMI using id rather than name-matching
Prefer specific asserts where possible
make tests that decode credentials use valid base64 encoded strings
Issue 1120: support base64 encode/decode for url applications
Enforce no illegal throws via Checkstyle

Also remove a stray unused import.
Merge pull request #955 from jclouds/base64-urlsafe

Issue 1120: support base64 encode/decode for url applications
Merge pull request #953 from aledsage/Setting-RunScriptOnNode.Factory

Setting RunScriptOnNode.factory
Merge pull request #956 from andrewgaul/checkstyle-illegal-throws

Enforce no illegal throws via Checkstyle
Merge pull request #954 from andrewgaul/specific-asserts

Prefer specific asserts where possible
Added basic pagination features in template list

Added basic pagination features in template listings.
There is still pending the global refactor to adapt every paginated call
to the PagedIterable.
Add GNU GMP library to Travis CI config
Revert "test"

This reverts commit 014341fc539f98f9c37acc8a9ba7429f17d4331c.
Added joint images for two presenters
Use ADN::CLI::VERSION as the version number, added myself to the list of authors, changed the homepage.
Last Getting Started changes translation
Sprint 17 strings translation
Remove unused color editor strings
Merge pull request #2273 from jbalsas/spanish-loc-sprint17

Spanish translation Sprint17
TypeChooser now listens to type changed event to update the GUI accordingly
Library.txt: fix bug when setting file extensions
updated settings/.gitignore
bugfix: memory invalid reads might happen with patterns like \b\b in the new streaming implementation of the Thompson VM.
More cleanup as we remove PageObject from the code.
added process relative path functionality
add _cart template now
Use javascript vars that work on all supported borwsers
Add protocol too
Remove extra :
Merge pull request #1099 from ajaxorg/doc/changelog

Fix changelog update for Firefox
* updated ace and apf
fixes #1645 added 'File Revision History' to contextmenu of editor and tab
ImageSerializer test machine with class, values and object
uh...  compiler errors are mostly gone... except for one.. but i think it's due to me messing up my compiler on this computer...
Initial iOS code and project support.  See the 'iOS Notes'
section in README.md for how to use it.
Add extra interface for web service
fixed error generating canonical urls on ads
Portal is in RDI for x86_64 #234
Add details to description.
switch out wocontext.directActionURLForActionNamed for ERXWOContext.directActionUrl -- a test to get relative urls generated when using Apache/SSL.
Added names for resp and invp
minor comment on why we can use rewrite for non dpt cases
Updating Fibrations.v, keeping the names, statements and body of lemmas as unchanged as possible (still, using the groupish notations introduced in Paths.v)
removed some forgotten 'Defined'
Modified Contractible. Shorten proof that two parallel paths in a contractible set are homotopic
modified a comment
Move TextMate themes submodule to new 'HEAD'.
Update recipes/web.rb

Fix for:
FATAL: Chef::Mixin::Template::TemplateError: undefined method `each' for "zabbix":String

Change to array and set default in attributes file.
moved 1 pixel
moved back
Use SendGrid instead of MailGun
New setting for SendGrid
New setting for SendGrid
Updated devise mail config
wiki: Replace wiki css with less.
Fix kernel-qemu rule
small refactor of the binary expr
typo
Added Share... to menu.
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.
Merge pull request #1 from DrDub/master

Fixed variable names and added test_storify.
** Wrapped Friends and Users REST services method results inside
ApiResult (last change broke the api)
** Replaced API Events with CDI events (Issue
https://code.google.com/p/fni/issues/detail?id=152)
** Removed some deprecation warnings from Messages REST Service (Part of
issue https://code.google.com/p/fni/issues/detail?id=153)
** Added isEditableType method to MaterialController and refactored
ForgeWorkspaceManager to use it
** Added getUserMaterialRole method into MaterialPermissionController
** Added getUserPrimaryEmail, getUserSetting and getUserSettingValue
methods into UserController
TOMEE-666 trying to resolve persistence unit in a better manner

git-svn-id: https://svn.apache.org/repos/asf/openejb/trunk@1423820 13f79535-47bb-0310-9956-ffa450edef68
Removed HStoreConf 'site.specexec_idle' option. It's just not needed anymore
Finally fixed the round-robin partition assignment to work automatically
Able to edit project entries